Merge pull request #783 from weipeng2k/master

loadFilterConfig's source add classloader which loaded FilterManager sel...

src/main/java/com/alibaba/druid/filter/FilterManager.java

@@ -59,6 +59,7 @@ public class FilterManager {
         Properties filterProperties = new Properties();
 
         loadFilterConfig(filterProperties, ClassLoader.getSystemClassLoader());
+        loadFilterConfig(filterProperties, FilterManager.class.getClassLoader());
         loadFilterConfig(filterProperties, Thread.currentThread().getContextClassLoader());
 
         return filterProperties;

src/test/java/com/alibaba/druid/bvt/filter/FilterManagerTest.java

@@ -13,6 +13,17 @@ import com.alibaba.druid.filter.FilterManager;
 
 public class FilterManagerTest extends TestCase {
 
+	static {
+		ClassLoader current = Thread.currentThread().getContextClassLoader();
+		try {
+			Thread.currentThread().setContextClassLoader(null);
+			
+			Assert.assertNotNull(FilterManager.getFilter("stat"));
+		} finally {
+			Thread.currentThread().setContextClassLoader(current);
+		}
+	}
+	
     public void test_instance() throws Exception {
         new FilterManager();
     }
@@ -38,6 +49,7 @@ public class FilterManagerTest extends TestCase {
         }
         Assert.assertNotNull(error);
     }
+    
 
     public static class ErrorFilter extends FilterAdapter {