fix classloader by filter

Author: 孙健

src/main/java/org/nlpcn/jcoder/controller/SystemAction.java

@@ -49,7 +49,7 @@ public void list(HttpServletRequest req) {
 	@Ok("raw")
 	public void export(HttpServletResponse response) throws IOException {
 
-		BackupService backupService = StaticValue.getBean(BackupService.class, "backupService");
+		BackupService backupService = StaticValue.getSystemIoc().get(BackupService.class, "backupService");
 
 		String timeStamp = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss");
 		response.setContentType("application/octet-stream");
@@ -67,7 +67,7 @@ public String uploadJar(@Param("file") TempFile[] fileList) throws Exception {
 			throw new Exception("up file can not empty");
 		}
 
-		BackupService backupService = StaticValue.getBean(BackupService.class, "backupService");
+		BackupService backupService = StaticValue.getSystemIoc().get(BackupService.class, "backupService");
 
 		StringBuilder sb = new StringBuilder();
 

src/main/java/org/nlpcn/jcoder/domain/CodeInfo.java

@@ -22,7 +22,7 @@
  */
 public class CodeInfo {
 
-	private static final Logger LOG = LoggerFactory.getLogger(CodeInfo.class) ;
+	private static final Logger LOG = LoggerFactory.getLogger(CodeInfo.class);
 
 	private Class<?> classz;
 
@@ -113,6 +113,7 @@ public ExecuteMethod getDefaultMethod() {
 
 	/**
 	 * 通过方法名称获得方法
+	 * 
 	 * @param methodName
 	 * @return
 	 */
@@ -122,6 +123,7 @@ public ExecuteMethod getExecuteMethod(String methodName) {
 
 	/**
 	 * 执行方法的抽象类
+	 * 
 	 * @author Ansj
 	 *
 	 */

src/main/java/org/nlpcn/jcoder/filter/JcoderFilter.java

@@ -11,6 +11,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.nlpcn.commons.lang.util.StringUtil;
+import org.nlpcn.jcoder.run.java.DynamicEngine;
 import org.nlpcn.jcoder.run.mvc.ApiActionHandler;
 import org.nlpcn.jcoder.run.mvc.view.JsonView;
 import org.nlpcn.jcoder.util.ApiException;
@@ -71,9 +72,9 @@ private void _doFilter(final FilterChain chain, HttpServletRequest request, Http
 		Mvcs.setIoc(StaticValue.getUserIoc()); // reset ioc
 
 		Mvcs.setServletContext(sc);
-
+		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
 		try {
-
+			Thread.currentThread().setContextClassLoader(DynamicEngine.getInstance().getParentClassLoader());
 			Mvcs.set(this.selfName, request, response);
 
 			if (!apiHandler.handle(request, response)) {
@@ -85,6 +86,7 @@ private void _doFilter(final FilterChain chain, HttpServletRequest request, Http
 			}
 
 		} finally {
+			Thread.currentThread().setContextClassLoader(contextClassLoader);
 			Mvcs.set(null, null, null);
 			Mvcs.ctx().removeReqCtx();
 			Mvcs.setServletContext(null);

src/main/java/org/nlpcn/jcoder/job/CheckTaskJob.java

@@ -17,7 +17,7 @@ public class CheckTaskJob implements Runnable {
 	@Override
 	public void run() {
 
-		TaskService taskService = StaticValue.getBean(TaskService.class, "taskService");
+		TaskService taskService = StaticValue.getSystemIoc().get(TaskService.class, "taskService");
 
 		while (true) {
 			try {

src/main/java/org/nlpcn/jcoder/run/java/ClassUtil.java

@@ -9,18 +9,14 @@
 import java.net.JarURLConnection;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
 import org.nlpcn.jcoder.util.JcoderIOUtil;
 
-import com.google.common.base.Joiner;
-
 /**
  * 类相关的工具类
  * 

src/main/java/org/nlpcn/jcoder/run/java/DynamicEngine.java

@@ -39,13 +39,14 @@ public static DynamicEngine getInstance() {
 
 	/**
 	 * 刷新instance
-	 * @throws TaskException 
+	 * 
+	 * @throws TaskException
 	 */
 	public static void flush(URLClassLoader classLoader) throws TaskException {
 		ourInstance = new DynamicEngine(classLoader);
 		// if class load change , to flush all task
 		synchronized (StaticValue.MAPPING) {
-			StaticValue.getBean(TaskService.class, "taskService").initTaskFromDB();
+			StaticValue.getSystemIoc().get(TaskService.class, "taskService").initTaskFromDB();
 		}
 
 	}
@@ -122,9 +123,9 @@ public Class<?> javaCodeToClass(String fullClassName, String javaCode) throws IO
 				clazz = dynamicClassLoader.loadClass(fullClassName, jco);
 			} catch (Exception e) {
 				e.printStackTrace();
-				LOG.error(e.getMessage(),e);
+				LOG.error(e.getMessage(), e);
 			} catch (Error e) {
-				LOG.error(e.getMessage(),e);
+				LOG.error(e.getMessage(), e);
 				throw new CodeException(e.toString());
 			} finally {
 				if (dynamicClassLoader != null) {
@@ -141,8 +142,7 @@ public Class<?> javaCodeToClass(String fullClassName, String javaCode) throws IO
 
 		return clazz;
 	}
-	
-	
+
 	public byte[] javaCode2Bytes(String fullClassName, String javaCode) throws IOException, CodeException {
 		Class<?> clazz = null;
 		JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
@@ -152,7 +152,7 @@ public byte[] javaCode2Bytes(String fullClassName, String javaCode) throws IOExc
 		jfiles.add(new CharSequenceJavaFileObject(fullClassName, javaCode));
 
 		List<String> options = new ArrayList<String>();
-		
+
 		options.add("-source");
 		options.add("1.6");
 		options.add("-target");
@@ -162,7 +162,6 @@ public byte[] javaCode2Bytes(String fullClassName, String javaCode) throws IOExc
 		options.add("-classpath");
 		options.add(this.classpath);
 		options.add("-parameters");
-		    
 
 		JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, diagnostics, options, null, jfiles);
 		boolean success = task.call();
@@ -178,12 +177,12 @@ public byte[] javaCode2Bytes(String fullClassName, String javaCode) throws IOExc
 						dynamicClassLoader.loadClass(name, inner);
 					}
 				}
-				return jco.getBytes() ;
+				return jco.getBytes();
 			} catch (Exception e) {
 				e.printStackTrace();
-				LOG.error(e.getMessage(),e);
+				LOG.error(e.getMessage(), e);
 			} catch (Error e) {
-				LOG.error(e.getMessage(),e);
+				LOG.error(e.getMessage(), e);
 				throw new CodeException(e.toString());
 			} finally {
 				if (dynamicClassLoader != null) {
@@ -198,7 +197,7 @@ public byte[] javaCode2Bytes(String fullClassName, String javaCode) throws IOExc
 			throw new CodeException(error.toString());
 		}
 
-		return null ;
+		return null;
 	}
 
 	public <T> T javaCodeToObject(String fullClassName, String javaCode) throws IllegalAccessException, InstantiationException, IOException, CodeException {
@@ -239,9 +238,4 @@ public URLClassLoader getParentClassLoader() {
 		return parentClassLoader;
 	}
 
-	public Class<?> javaCodeToClassFile(String string, String sourcePath) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 }

src/main/java/org/nlpcn/jcoder/run/java/JavaRunner.java

@@ -173,9 +173,6 @@ private void _instance() {
 
 			Mirror<?> mirror = Mirror.me(codeInfo.getClassz());
 
-			ClassLoader defaultClassLoader = Thread.currentThread().getContextClassLoader();
-
-			Thread.currentThread().setContextClassLoader(DynamicEngine.getInstance().getParentClassLoader());
 			for (Field field : mirror.getFields()) {
 				Inject inject = field.getAnnotation(Inject.class);
 				if (inject != null) {
@@ -191,7 +188,6 @@ private void _instance() {
 					field.setAccessible(false);
 				}
 			}
-			Thread.currentThread().setContextClassLoader(defaultClassLoader);
 
 			if (codeInfo.isSingle()) {
 				codeInfo.setJavaObject(objInstance);

src/main/java/org/nlpcn/jcoder/run/mvc/JcoderActionChain.java

@@ -4,6 +4,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.nlpcn.jcoder.run.java.DynamicEngine;
 import org.nlpcn.jcoder.run.mvc.processor.ApiMethodInvokeProcessor;
 import org.nutz.lang.Lang;
 import org.nutz.mvc.ActionChain;
@@ -46,7 +47,7 @@ public JcoderActionChain(List<Processor> list, ApiMethodInvokeProcessor invokePr
 	}
 
 	public void doChain(ActionContext ac) {
-		if (null != head)
+		if (null != head) {
 			try {
 				head.process(ac);
 			} catch (Throwable e) {
@@ -57,8 +58,9 @@ public void doChain(ActionContext ac) {
 					throw Lang.wrapThrow(ee);
 				}
 			}
+		}
 	}
-	
+
 	public ApiMethodInvokeProcessor getInvokeProcessor() {
 		return invokeProcessor;
 	}

src/main/java/org/nlpcn/jcoder/run/mvc/processor/ApiActionFiltersProcessor.java

@@ -21,47 +21,49 @@
  */
 public class ApiActionFiltersProcessor extends AbstractProcessor {
 
-    protected List<ActionFilter> filters = new ArrayList<ActionFilter>();
-    
-    protected Processor proxyProcessor;
-    
-    protected Processor lastProcessor;
-    
-    public void init(NutConfig config, ActionInfo ai) throws Throwable {
-        ObjectInfo<? extends ActionFilter>[] filterInfos = ai.getFilterInfos();
-        if (null != filterInfos) {
-            for (int i = 0; i < filterInfos.length; i++) {
-            	ActionFilter filter = evalObj(config, filterInfos[i]);
-                filters.add(filter);
-                if (filter instanceof Processor) {
-            		Processor processor = (Processor)filter;
-                	if (proxyProcessor == null) {
-                		proxyProcessor = processor;
-                		lastProcessor = processor;
-                	} else {
-                		processor.setNext(proxyProcessor);
-                		proxyProcessor = processor;
-                	}
-                }
-            }
-        }
-    }
+	protected List<ActionFilter> filters = new ArrayList<ActionFilter>();
 
-    public void process(ActionContext ac) throws Throwable {
-        for (ActionFilter filter : filters) {
-            View view = filter.match(ac);
-            if (null != view) {
-                ac.setMethodReturn(view);
-                renderView(ac);
-                return;
-            }
-        }
-        if (proxyProcessor == null) {
-        	doNext(ac);
-        } else {
-        	if (lastProcessor != null)
-        		lastProcessor.setNext(next);
-        	proxyProcessor.process(ac);
-        }
-    }
+	protected Processor proxyProcessor;
+
+	protected Processor lastProcessor;
+
+	public void init(NutConfig config, ActionInfo ai) throws Throwable {
+		ObjectInfo<? extends ActionFilter>[] filterInfos = ai.getFilterInfos();
+		if (null != filterInfos) {
+			for (int i = 0; i < filterInfos.length; i++) {
+				ActionFilter filter = evalObj(config, filterInfos[i]);
+				filters.add(filter);
+				if (filter instanceof Processor) {
+					Processor processor = (Processor) filter;
+					if (proxyProcessor == null) {
+						proxyProcessor = processor;
+						lastProcessor = processor;
+					} else {
+						processor.setNext(proxyProcessor);
+						proxyProcessor = processor;
+					}
+				}
+			}
+		}
+	}
+
+	public void process(ActionContext ac) throws Throwable {
+
+		for (ActionFilter filter : filters) {
+			View view = filter.match(ac);
+			if (null != view) {
+				ac.setMethodReturn(view);
+				renderView(ac);
+				return;
+			}
+		}
+
+		if (proxyProcessor == null) {
+			doNext(ac);
+		} else {
+			if (lastProcessor != null)
+				lastProcessor.setNext(next);
+			proxyProcessor.process(ac);
+		}
+	}
 }

src/main/java/org/nlpcn/jcoder/scheduler/TaskJob.java

@@ -1,6 +1,7 @@
 package org.nlpcn.jcoder.scheduler;
 
 import org.nlpcn.jcoder.domain.Task;
+import org.nlpcn.jcoder.run.java.DynamicEngine;
 import org.nlpcn.jcoder.run.java.JavaRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,13 +33,16 @@ public long getStartTime() {
 	@Override
 	public void run() {
 		over = false;
+		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
 		try {
+			Thread.currentThread().setContextClassLoader(DynamicEngine.getInstance().getParentClassLoader());
 			new JavaRunner(task).compile().instance().execute() ;
 		} catch (Exception e) {
 			e.printStackTrace();
 			LOG.error(e.getMessage(),e);
 		} finally {
 			over = true;
+			Thread.currentThread().setContextClassLoader(contextClassLoader);
 			ThreadManager.removeTaskIfOver(this.getName());
 		}