Browse Source

jfinal 3.2 release ^_^

James 8 years ago
parent
commit
5b5452eeeb

+ 3 - 5
src/main/java/com/jfinal/core/JFinal.java

@@ -54,11 +54,11 @@ public final class JFinal {
 		return me;
 	}
 	
-	boolean init(JFinalConfig jfinalConfig, ServletContext servletContext) {
+	void init(JFinalConfig jfinalConfig, ServletContext servletContext) {
 		this.servletContext = servletContext;
 		this.contextPath = servletContext.getContextPath();
 		
-		initPathUtil();
+		initPathKit();
 		
 		Config.configJFinal(jfinalConfig);	// start plugin, init log factory and init engine in this method
 		constants = Config.getConstants();
@@ -68,8 +68,6 @@ public final class JFinal {
 		initRender();
 		initOreillyCos();
 		initTokenManager();
-		
-		return true;
 	}
 	
 	private void initTokenManager() {
@@ -88,7 +86,7 @@ public final class JFinal {
 		OreillyCos.init(constants.getBaseUploadPath(), constants.getMaxPostSize(), constants.getEncoding());
 	}
 	
-	private void initPathUtil() {
+	private void initPathKit() {
 		String path = servletContext.getRealPath("/");
 		PathKit.setWebRootPath(path);
 	}

+ 4 - 4
src/main/java/com/jfinal/core/JFinalFilter.java

@@ -46,9 +46,7 @@ public class JFinalFilter implements Filter {
 	public void init(FilterConfig filterConfig) throws ServletException {
 		createJFinalConfig(filterConfig.getInitParameter("configClass"));
 		
-		if (jfinal.init(jfinalConfig, filterConfig.getServletContext()) == false) {
-			throw new RuntimeException("JFinal init error!");
-		}
+		jfinal.init(jfinalConfig, filterConfig.getServletContext());
 		
 		String contextPath = filterConfig.getServletContext().getContextPath();
 		contextPathLength = (contextPath == null || "/".equals(contextPath) ? 0 : contextPath.length());
@@ -57,7 +55,7 @@ public class JFinalFilter implements Filter {
 		encoding = constants.getEncoding();
 		jfinalConfig.afterJFinalStart();
 		
-		handler = jfinal.getHandler();
+		handler = jfinal.getHandler();		// 开始接受请求
 	}
 	
 	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
@@ -87,6 +85,8 @@ public class JFinalFilter implements Filter {
 	}
 	
 	public void destroy() {
+		handler = null;		// 停止接受请求
+		
 		jfinalConfig.beforeJFinalStop();
 		jfinal.stopPlugins();
 	}