diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-03-27 14:21:16 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-03-27 14:21:16 +0000 |
commit | 83be33d982055e2f86a97270dd400f01fb9cb928 (patch) | |
tree | dc851920b2479f850cf341beb8b91829b6627795 /branches/sca-java-1.x/modules/implementation-ejb/src | |
parent | 2a250a3a8278290af0505253acdffbc8c68bce2f (diff) |
TUSCANY-2944 don't raise NPE if the component type model cannot be determined
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@759149 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/modules/implementation-ejb/src')
-rw-r--r-- | branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java b/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java index 0a4bb8b2db..cfdf0790d2 100644 --- a/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java +++ b/branches/sca-java-1.x/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java @@ -140,13 +140,21 @@ public class EJBImplementationProcessor extends BaseStAXArtifactProcessor implem if(jeeExtension != null) { ComponentType ct = jeeExtension.createImplementationEjbComponentType(ejbModuleInfo, ejbLink); - implementation.getServices().addAll(ct.getServices()); + // TODO - SL - TUSCANY-2944 - these new JEE processors are causing problems with existing contributions + // ct is null if there is no EJBInfo + if (ct != null){ + implementation.getServices().addAll(ct.getServices()); + } } if(jeeOptionalExtension != null) { ComponentType ct = jeeOptionalExtension.createImplementationEjbComponentType(ejbModuleInfo, ejbLink); - implementation.getReferences().addAll(ct.getReferences()); - implementation.getProperties().addAll(ct.getProperties()); + // TODO - SL - TUSCANY-2944 - these new JEE processors are causing problems with existing contributions + // ct is null if there is no EJBInfo + if (ct != null){ + implementation.getReferences().addAll(ct.getReferences()); + implementation.getProperties().addAll(ct.getProperties()); + } } // TODO: Introspection of bean class |