summaryrefslogtreecommitdiffstats
path: root/branches
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-03-26 12:42:30 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-03-26 12:42:30 +0000
commitde53364092d375a98144b29e85e09abc8842268e (patch)
tree063c7c337cdb25775c0842db5a9e75aeac858a49 /branches
parentb9bec749de05ebc6ed1c51fb8fb4a447fd8c4409 (diff)
Don't fall over if there is no introspector, e.g. if contribution-jee-impl is not loaded
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@758611 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches')
-rw-r--r--branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java13
1 files changed, 8 insertions, 5 deletions
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java
index c5e9e6327b..36aabefa99 100644
--- a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java
@@ -48,12 +48,15 @@ public class EjbArchiveProcessor implements URLArtifactProcessor<EjbModuleInfo>
}
public EjbModuleInfo read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
- EjbModuleInfo ejbModuleInfo = jeeIntrospector.introspectEjbArchive(artifactURL);
- if(ejbModuleInfo != null) {
- ejbModuleInfo.setUri(artifactURI);
- ejbModuleInfo.setModuleName(new File(artifactURL.getFile()).getName());
+ if (jeeIntrospector != null) {
+ EjbModuleInfo ejbModuleInfo = jeeIntrospector.introspectEjbArchive(artifactURL);
+ if(ejbModuleInfo != null) {
+ ejbModuleInfo.setUri(artifactURI);
+ ejbModuleInfo.setModuleName(new File(artifactURL.getFile()).getName());
+ }
+ return ejbModuleInfo;
}
- return ejbModuleInfo;
+ return null;
}
public Class<EjbModuleInfo> getModelType() {