Merge branch 'master' into jfinal-java8

src/main/java/com/jfinal/plugin/activerecord/Table.java

@@ -106,7 +106,11 @@ public class Table {
 	}
 	
 	public Set<Entry<String, Class<?>>> getColumnTypeMapEntrySet() {
-		return columnTypeMap.entrySet();
+		return Collections.unmodifiableSet(columnTypeMap.entrySet());
+	}
+	
+	public Set<String> getColumnNameSet() {
+		return Collections.unmodifiableSet(columnTypeMap.keySet());
 	}
 }
 

src/main/java/com/jfinal/plugin/ehcache/EhCachePlugin.java

@@ -64,8 +64,9 @@ public class EhCachePlugin implements IPlugin {
 	}
 	
 	private void createCacheManager() {
-		if (cacheManager != null)
+		if (cacheManager != null) {
 			return ;
+		}
 		
 		if (configurationFileName != null) {
 			cacheManager = CacheManager.create(configurationFileName);
@@ -92,6 +93,7 @@ public class EhCachePlugin implements IPlugin {
 	
 	public boolean stop() {
 		cacheManager.shutdown();
+		cacheManager = null;
 		return true;
 	}
 }