From d590bb3b03111d9bbb6d78607da60b811cec74f7 Mon Sep 17 00:00:00 2001 From: RedKale <22250530@qq.com> Date: Wed, 17 Feb 2016 11:09:33 +0800 Subject: [PATCH] --- src/org/redkale/util/ResourceFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/redkale/util/ResourceFactory.java b/src/org/redkale/util/ResourceFactory.java index 5aab758ef..3aafaad14 100644 --- a/src/org/redkale/util/ResourceFactory.java +++ b/src/org/redkale/util/ResourceFactory.java @@ -312,7 +312,7 @@ public final class ResourceFactory { } } final String rcname = tname; - ResourceEntry re = genctype == classtype ? null : findEntry(rcname, genctype); + ResourceEntry re = findEntry(rcname, genctype); if (re == null) { // if (Map.class.isAssignableFrom(classtype)) { // 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); if (it != null) { it.load(this, src, rcname, field, attachment); - re = genctype == classtype ? findEntry(rcname, classtype) : findEntry(rcname, genctype); + re = findEntry(rcname, genctype); } } if (re == null) { register(rcname, genctype, null); //自动注入null的值 - re = genctype == classtype ? findEntry(rcname, classtype) : findEntry(rcname, genctype); + re = findEntry(rcname, genctype); } if (re == null) continue; re.elements.add(new ResourceElement<>(src, field));