fix actframework#291

greenlaw110 · greenlaw110 · commit 3557f2907dc5 · 2017-07-17T06:27:07.000+10:00
diff --git a/pom.xml b/pom.xml
@@ -19,6 +19,7 @@
 *            version history
 ********************************************
 1.3.8
+* #309 Add `templatePath` method into `Mailer.Util`
 * #307 java.lang.IllegalStateException: parent context not found
 * #306 Allow user to set content through `Mailer.Util`
 * #305 Add `attach(...)` methods into `Mailer.Util`
diff --git a/src/main/java/act/util/ActContext.java b/src/main/java/act/util/ActContext.java
@@ -405,11 +405,11 @@ public static ActContext currentContext() {
             if (null != ctx) {
                 return ctx;
             }
-            ctx = MailerContext.current();
+            ctx = CliContext.current();
             if (null != ctx) {
                 return ctx;
             }
-            ctx = CliContext.current();
+            ctx = MailerContext.current();
             if (null != ctx) {
                 return ctx;
             }

Original file line number	Diff line number	Diff line change
`@@ -405,11 +405,11 @@ public static ActContext currentContext() {`
`405`	`405`	`if (null != ctx) {`
`406`	`406`	`return ctx;`
`407`	`407`	`}`
`408`		`- ctx = MailerContext.current();`
	`408`	`+ ctx = CliContext.current();`
`409`	`409`	`if (null != ctx) {`
`410`	`410`	`return ctx;`
`411`	`411`	`}`
`412`		`- ctx = CliContext.current();`
	`412`	`+ ctx = MailerContext.current();`
`413`	`413`	`if (null != ctx) {`
`414`	`414`	`return ctx;`
`415`	`415`	`}`