Browse Source

jfinal 3.6

James 7 years ago
parent
commit
f5d81d11a8
1 changed files with 10 additions and 4 deletions
  1. 10 4
      src/main/java/com/jfinal/core/ActionMapping.java

+ 10 - 4
src/main/java/com/jfinal/core/ActionMapping.java

@@ -77,11 +77,17 @@ public class ActionMapping {
 				
 				
 				// if (excludedMethodName.contains(methodName) /* || method.getParameterTypes().length != 0 */)
 				// if (excludedMethodName.contains(methodName) /* || method.getParameterTypes().length != 0 */)
 					// continue ;
 					// continue ;
-				if (method.getDeclaringClass() == Controller.class || method.getDeclaringClass() == Object.class)
-					continue ;
 				
 				
-				if (sonOfController && !Modifier.isPublic(method.getModifiers()))
-					continue ;
+				
+				if (sonOfController) {
+					if (!Modifier.isPublic(method.getModifiers()))
+						continue ;
+				} else {
+					if (method.getDeclaringClass() == Controller.class || method.getDeclaringClass() == Object.class)
+						continue ;
+				}
+				
+				
 				if (method.getAnnotation(NotAction.class) != null)
 				if (method.getAnnotation(NotAction.class) != null)
 					continue ;
 					continue ;