fix actframework#197

greenlaw110 · greenlaw110 · commit f9e4a73c7b2c · 2017-05-09T16:49:16.000+10:00
diff --git a/src/main/java/act/handler/builtin/controller/impl/ReflectedHandlerInvoker.java b/src/main/java/act/handler/builtin/controller/impl/ReflectedHandlerInvoker.java
@@ -235,7 +235,7 @@ public Result handle(ActionContext context) throws Exception {
         }
 
         context.attribute("reflected_handler", this);
-        if (null != templateContext) {
+        if (null != templateContext && context.state().isHandling()) {
             context.templateContext(templateContext);
         }
         preventDoubleSubmission(context);
@@ -456,7 +456,7 @@ private Object controllerInstance(ActionContext context) {
     private void initCacheParams() {
         CacheFor cacheFor = method.getAnnotation(CacheFor.class);
         cacheSupport = null == cacheFor ? CacheSupportMetaInfo.disabled() :  CacheSupportMetaInfo.enabled(
-                new CacheKeyBuilder(cacheFor, method.getName()),
+                new CacheKeyBuilder(cacheFor, S.concat(controllerClass.getName(), ".", method.getName())),
                 cacheFor.value(),
                 cacheFor.supportPost()
         );
@@ -604,7 +604,7 @@ public NotFound notFoundOnMethod(String message) {
 
     private boolean checkTemplate(ActionContext context) {
         if (!context.state().isHandling()) {
-            // we don't check template on interceptors
+            //we don't check template on interceptors
             return false;
         }
         Boolean hasTemplate = context.hasTemplate();
@@ -879,20 +879,31 @@ protected void releaseResources() {
 
     private static class CacheKeyBuilder extends $.F1<ActionContext, String> {
         private String[] keys;
-        private final String methodName;
+        private final String base;
 
-        CacheKeyBuilder(CacheFor cacheFor, String methodName) {
-            this.methodName = methodName;
+        CacheKeyBuilder(CacheFor cacheFor, String actionPath) {
+            this.base = base(actionPath);
             this.keys = cacheFor.keys();
         }
 
+        private String base(String actionPath) {
+            S.Buffer buffer = S.newBuffer();
+            String[] sa = actionPath.split("\\.");
+            for (String s : sa) {
+                buffer.append(s.charAt(0));
+            }
+            buffer.append(actionPath.hashCode());
+            return buffer.toString();
+        }
+
         @Override
         public String apply(ActionContext context) throws NotAppliedException, Osgl.Break {
             TreeMap<String, String> keyValues = keyValues(context);
-            S.Buffer buffer = S.newBuffer(methodName);
+            S.Buffer buffer = S.newBuffer(base);
             for (Map.Entry<String, String> entry : keyValues.entrySet()) {
                 buffer.append("-").append(entry.getKey()).append(":").append(entry.getValue());
             }
+            buffer.append(context.userAgent().isMobile() ? "M" : "B");
             return buffer.toString();
         }
 
diff --git a/src/main/java/act/util/ActContext.java b/src/main/java/act/util/ActContext.java
@@ -70,7 +70,7 @@ public interface ActContext<CTX_TYPE extends ActContext> extends ParamValueProvi
     /**
      * Set template context
      * @param context the path to template context
-     * @return this {@code AppContext}
+     * @return this {@code ActContext}
      */
     CTX_TYPE templateContext(String context);
 
@@ -206,7 +206,7 @@ public String templatePath() {
 
         @Override
         public CTX templatePath(String templatePath) {
-            template = null;
+            this.template = null;
             this.templatePath = templatePath;
             return me();
         }
@@ -216,7 +216,7 @@ public String templateContext() {
         }
 
         public CTX templateContext(String templateContext) {
-            template = null;
+            this.template = null;
             this.templateContext = templateContext;
             return me();
         }
