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

Browse Source
This commit is contained in:
RedKale
2016-02-17 11:09:33 +08:00
parent 435acc4fb2
commit d590bb3b03
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/redkale/util/ResourceFactory.java
View File

@@ -312,7 +312,7 @@ public final class ResourceFactory {
} }
} }
final String rcname = tname; final String rcname = tname;
ResourceEntry re = genctype == classtype ? null : findEntry(rcname, genctype); ResourceEntry re = findEntry(rcname, genctype);
if (re == null) { if (re == null) {
// if (Map.class.isAssignableFrom(classtype)) { // if (Map.class.isAssignableFrom(classtype)) {
// Map map = find(Pattern.compile(rcname.isEmpty() ? ".*" : rcname), (Class) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[1], src); // Map map = find(Pattern.compile(rcname.isEmpty() ? ".*" : rcname), (Class) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[1], src);
@@ -328,12 +328,12 @@ public final class ResourceFactory {
ResourceLoader it = findLoader(field.getGenericType(), field); ResourceLoader it = findLoader(field.getGenericType(), field);
if (it != null) { if (it != null) {
it.load(this, src, rcname, field, attachment); it.load(this, src, rcname, field, attachment);
re = genctype == classtype ? findEntry(rcname, classtype) : findEntry(rcname, genctype); re = findEntry(rcname, genctype);
} }
} }
if (re == null) { if (re == null) {
register(rcname, genctype, null); //自动注入null的值 register(rcname, genctype, null); //自动注入null的值
re = genctype == classtype ? findEntry(rcname, classtype) : findEntry(rcname, genctype); re = findEntry(rcname, genctype);
} }
if (re == null) continue; if (re == null) continue;
re.elements.add(new ResourceElement<>(src, field)); re.elements.add(new ResourceElement<>(src, field));