[jboss-cvs] JBossAS SVN: r69043 - trunk/ejb3/src/main/org/jboss/injection.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 16 15:10:36 EST 2008
Author: heiko.braun at jboss.com
Date: 2008-01-16 15:10:36 -0500 (Wed, 16 Jan 2008)
New Revision: 69043
Modified:
trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
Log:
Metadata provides null values for collection properties. Was causing an NPE
Modified: trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java 2008-01-16 19:48:51 UTC (rev 69042)
+++ trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java 2008-01-16 20:10:36 UTC (rev 69043)
@@ -146,13 +146,16 @@
while(iterator.hasNext())
{
ServiceReferenceMetaData sref = srefMap.get(iterator.next());
- for(ResourceInjectionTargetMetaData injectionTuple : sref.getInjectionTargets())
+ if(sref.getInjectionTargets()!=null)
{
- if(method.getDeclaringClass().getName().equals(injectionTuple.getInjectionTargetClass())
- && method.getName().equals(injectionTuple.getInjectionTargetName()))
+ for(ResourceInjectionTargetMetaData injectionTuple : sref.getInjectionTargets())
{
- match = sref;
- break;
+ if(method.getDeclaringClass().getName().equals(injectionTuple.getInjectionTargetClass())
+ && method.getName().equals(injectionTuple.getInjectionTargetName()))
+ {
+ match = sref;
+ break;
+ }
}
}
}
@@ -167,13 +170,16 @@
while(iterator.hasNext())
{
ServiceReferenceMetaData sref = srefMap.get(iterator.next());
- for(ResourceInjectionTargetMetaData injectionTuple : sref.getInjectionTargets())
+ if(sref.getInjectionTargets()!=null)
{
- if(field.getDeclaringClass().getName().equals(injectionTuple.getInjectionTargetClass())
- && field.getName().equals(injectionTuple.getInjectionTargetName()))
+ for(ResourceInjectionTargetMetaData injectionTuple : sref.getInjectionTargets())
{
- match = sref;
- break;
+ if(field.getDeclaringClass().getName().equals(injectionTuple.getInjectionTargetClass())
+ && field.getName().equals(injectionTuple.getInjectionTargetName()))
+ {
+ match = sref;
+ break;
+ }
}
}
}
More information about the jboss-cvs-commits
mailing list