diff options
Diffstat (limited to 'branches/sca-java-1.x/modules/contribution-resource')
| -rw-r--r-- | branches/sca-java-1.x/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/branches/sca-java-1.x/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java b/branches/sca-java-1.x/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java index e614b47fc7..67836748fc 100644 --- a/branches/sca-java-1.x/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java +++ b/branches/sca-java-1.x/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java @@ -70,7 +70,8 @@ public class ArtifactModelResolver implements ModelResolver { if (import_ instanceof ResourceImport) { ResourceImport resourceImport = (ResourceImport)import_; //check the import location against the computed package name from the componentType URI - if (resourceImport.getURI().equals(uri)) { + if ((resourceImport.getURI().equals(uri)) && + (resourceImport.getModelResolver() != null)){ // Delegate the resolution to the import resolver resolved = resourceImport.getModelResolver().resolveModel(Artifact.class, (Artifact)unresolved); if (!resolved.isUnresolved()) { |