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

Browse Source
This commit is contained in:
Redkale
2017-05-27 11:54:28 +08:00
parent 92b3d0bbd4
commit 174a8a2a0c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -409,12 +409,13 @@ public final class ResourceFactory {
private ResourceLoader findMatchLoader(Type ft, Field field) { private ResourceLoader findMatchLoader(Type ft, Field field) {
ResourceLoader it = this.loadermap.get(ft); ResourceLoader it = this.loadermap.get(ft);
if (it == null) it = this.loadermap.get(field.getType()); if (it == null && field != null) it = this.loadermap.get(field.getType());
if (it != null) return it; if (it != null) return it;
return parent == null ? null : parent.findMatchLoader(ft, field); return parent == null ? null : parent.findMatchLoader(ft, field);
} }
private ResourceLoader findRegxLoader(Type ft, Field field) { private ResourceLoader findRegxLoader(Type ft, Field field) {
if (field == null) return null;
Class c = field.getType(); Class c = field.getType();
for (Map.Entry<Type, ResourceLoader> en : this.loadermap.entrySet()) { for (Map.Entry<Type, ResourceLoader> en : this.loadermap.entrySet()) {
Type t = en.getKey(); Type t = en.getKey();
@@ -424,7 +425,7 @@ public final class ResourceFactory {
return parent == null ? null : parent.findRegxLoader(ft, field); return parent == null ? null : parent.findRegxLoader(ft, field);
} }
private ResourceLoader findLoader(Type ft, Field field) { public ResourceLoader findLoader(Type ft, Field field) {
ResourceLoader it = this.findMatchLoader(ft, field); ResourceLoader it = this.findMatchLoader(ft, field);
return it == null ? findRegxLoader(ft, field) : it; return it == null ? findRegxLoader(ft, field) : it;
} }