Fix ControllerEnhancer regression

arden · Apr 3, 2011 · 82ed6fa · 82ed6fa
1 parent 8a0d412
commit 82ed6fa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/framework/src/play/classloading/enhancers/ControllersEnhancer.java b/framework/src/play/classloading/enhancers/ControllersEnhancer.java
@@ -97,7 +97,7 @@ public void edit(FieldAccess fieldAccess) throws CannotCompileException {
             } else {
 
                 // Auto redirect -->
-                if (Modifier.isPublic(ctMethod.getModifiers()) && !isHandler) {
+                if (Modifier.isPublic(ctMethod.getModifiers()) && Modifier.isStatic(ctMethod.getModifiers()) && ctMethod.getReturnType().equals(CtClass.voidType) && !isHandler) {
                     try {
                         ctMethod.insertBefore(
                                 "if(!play.classloading.enhancers.ControllersEnhancer.ControllerInstrumentation.isActionCallAllowed()) {"

diff --git a/framework/src/play/db/jpa/GenericModel.java b/framework/src/play/db/jpa/GenericModel.java
@@ -31,7 +31,6 @@
 import javax.persistence.PostLoad;
 import javax.persistence.PostPersist;
 import javax.persistence.PostUpdate;
-import play.Logger;
 import play.utils.Utils;
 
 /**