lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
kamhung
2015-12-09 11:37:20 +08:00
parent fd9376d4a3
commit ea4d62227a
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/redkale/boot/ClassFilter.java
View File

@@ -117,15 +117,13 @@ public final class ClassFilter<T> {
if (cf.conf != null) { if (cf.conf != null) {
if (property == null) { if (property == null) {
property = cf.conf; property = cf.conf;
} else if (property instanceof DefaultAnyValue) {
((DefaultAnyValue) property).addAll(cf.conf);
} else { } else {
if (property instanceof DefaultAnyValue) { DefaultAnyValue dav = new DefaultAnyValue();
((DefaultAnyValue) property).addAll(cf.conf); dav.addAll(property);
} else { dav.addAll(cf.conf);
DefaultAnyValue dav = new DefaultAnyValue(); property = dav;
dav.addAll(property);
dav.addAll(cf.conf);
property = dav;
}
} }
} }
entrys.add(new FilterEntry(clazz, autoscan, property)); entrys.add(new FilterEntry(clazz, autoscan, property));
@@ -349,7 +347,9 @@ public final class ClassFilter<T> {
urlfiles.add(url); urlfiles.add(url);
} }
} }
String selfpkg0 = ClassFilter.class.getPackage().getName();
selfpkg0 = selfpkg0.substring(0, selfpkg0.lastIndexOf('.') + 1);
final String selfpkg = selfpkg0;
List<File> files = new ArrayList<>(); List<File> files = new ArrayList<>();
boolean debug = logger.isLoggable(Level.FINEST); boolean debug = logger.isLoggable(Level.FINEST);
StringBuilder debugstr = new StringBuilder(); StringBuilder debugstr = new StringBuilder();
@@ -370,7 +370,7 @@ public final class ClassFilter<T> {
String entryname = it.nextElement().getName().replace('/', '.'); String entryname = it.nextElement().getName().replace('/', '.');
if (entryname.endsWith(".class") && entryname.indexOf('$') < 0) { if (entryname.endsWith(".class") && entryname.indexOf('$') < 0) {
String classname = entryname.substring(0, entryname.length() - 6); String classname = entryname.substring(0, entryname.length() - 6);
if (classname.startsWith("javax.") || classname.startsWith("com.sun.") || classname.startsWith("com.mysql.")) continue; if (classname.startsWith("javax.") || classname.startsWith("com.sun.") || classname.startsWith(selfpkg) || classname.startsWith("com.mysql.")) continue;
classes.add(classname); classes.add(classname);
if (debug) debugstr.append(classname).append("\r\n"); if (debug) debugstr.append(classname).append("\r\n");
for (final ClassFilter filter : filters) { for (final ClassFilter filter : filters) {