Skip to content

Commit

Permalink
Merge pull request alibaba#784 from yakolee/master
Browse files Browse the repository at this point in the history
容器classLoader发生变化时,保证能loadFilterConfig
  • Loading branch information
yakolee committed Jan 29, 2015
2 parents 5147c46 + 7da97fc commit 6622f99
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/main/java/com/alibaba/druid/filter/FilterManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public static Properties loadFilterConfig() throws IOException {
loadFilterConfig(filterProperties, ClassLoader.getSystemClassLoader());
loadFilterConfig(filterProperties, FilterManager.class.getClassLoader());
loadFilterConfig(filterProperties, Thread.currentThread().getContextClassLoader());
loadFilterConfig(filterProperties, FilterManager.class.getClassLoader());

return filterProperties;
}
Expand Down

0 comments on commit 6622f99

Please sign in to comment.