Merge branch 'master' of https://github.com/thinkgem/jeesite

farkguidao · Dec 31, 2016 · 604d091 · 604d091
2 parents cfb80fd + da5ce3c
commit 604d091
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/com/thinkgem/jeesite/modules/act/service/ext/ActUserEntityServiceFactory.java b/src/main/java/com/thinkgem/jeesite/modules/act/service/ext/ActUserEntityServiceFactory.java
@@ -24,7 +24,7 @@ public Class<?> getSessionType() {
 	}
 
 	public Session openSession() {
-		// 返回自定义的GroupEntityManager实例
+		// 返回自定义的UserEntityManager实例
 		return actUserEntityService;
 	}
 

diff --git a/src/main/java/com/thinkgem/jeesite/modules/sys/interceptor/LogInterceptor.java b/src/main/java/com/thinkgem/jeesite/modules/sys/interceptor/LogInterceptor.java
@@ -61,6 +61,8 @@ public void afterCompletion(HttpServletRequest request, HttpServletResponse resp
 	        		new SimpleDateFormat("hh:mm:ss.SSS").format(endTime), DateUtils.formatDateTime(endTime - beginTime),
 					request.getRequestURI(), Runtime.getRuntime().maxMemory()/1024/1024, Runtime.getRuntime().totalMemory()/1024/1024, Runtime.getRuntime().freeMemory()/1024/1024, 
 					(Runtime.getRuntime().maxMemory()-Runtime.getRuntime().totalMemory()+Runtime.getRuntime().freeMemory())/1024/1024); 
+	        //删除线程变量中的数据，防止内存泄漏
+	        startTimeThreadLocal.remove();
 		}
 
 	}