James 6 年 前
コミット
f4fa7e35f2

+ 0 - 1
src/main/java/com/jfinal/aop/AopManager.java

@@ -44,7 +44,6 @@ public class AopManager {
 	 */
 	 */
 	public void setInjectDependency(boolean injectDependency) {
 	public void setInjectDependency(boolean injectDependency) {
 		this.injectDependency = injectDependency;
 		this.injectDependency = injectDependency;
-		InterceptorManager.me().setInjectDependency(injectDependency);
 	}
 	}
 	
 	
 	public boolean isInjectDependency() {
 	public boolean isInjectDependency() {

+ 2 - 13
src/main/java/com/jfinal/aop/InterceptorManager.java

@@ -20,7 +20,6 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
-import com.jfinal.core.Const;
 import com.jfinal.core.Controller;
 import com.jfinal.core.Controller;
 
 
 /**
 /**
@@ -37,16 +36,6 @@ import com.jfinal.core.Controller;
  */
  */
 public class InterceptorManager {
 public class InterceptorManager {
 	
 	
-	private boolean injectDependency = Const.DEFAULT_INJECT_DEPENDENCY;
-	
-	void setInjectDependency(boolean injectDependency) {
-		this.injectDependency = injectDependency;
-	}
-	
-	boolean isInjectDependency() {
-		return injectDependency;
-	}
-	
 	public static final Interceptor[] NULL_INTERS = new Interceptor[0];
 	public static final Interceptor[] NULL_INTERS = new Interceptor[0];
 	
 	
 	// 控制层与业务层全局拦截器
 	// 控制层与业务层全局拦截器
@@ -173,7 +162,7 @@ public class InterceptorManager {
 				result[i] = singletonMap.get(interceptorClasses[i]);
 				result[i] = singletonMap.get(interceptorClasses[i]);
 				if (result[i] == null) {
 				if (result[i] == null) {
 					result[i] = (Interceptor)interceptorClasses[i].newInstance();
 					result[i] = (Interceptor)interceptorClasses[i].newInstance();
-					if (injectDependency) {
+					if (AopManager.me().isInjectDependency()) {
 						Aop.inject(result[i]);
 						Aop.inject(result[i]);
 					}
 					}
 					singletonMap.put(interceptorClasses[i], result[i]);
 					singletonMap.put(interceptorClasses[i], result[i]);
@@ -208,7 +197,7 @@ public class InterceptorManager {
 		}
 		}
 		
 		
 		for (Interceptor inter : inters) {
 		for (Interceptor inter : inters) {
-			if (injectDependency) {
+			if (AopManager.me().isInjectDependency()) {
 				Aop.inject(inter);
 				Aop.inject(inter);
 			}
 			}
 			singletonMap.put(inter.getClass(), inter);
 			singletonMap.put(inter.getClass(), inter);