Merge r723501 changes for TUSCANY-2698 into the 1.4 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723908 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 1 deletions

diff --git a/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java b/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
index 880e95480e..d0f769c9d1 100644
--- a/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
+++ b/branches/sca-java-1.4/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
@@ -195,8 +195,10 @@ public class ContributionContentProcessor implements URLArtifactProcessor<Contri
             if (model != null) {
                 try {
                    artifactProcessor.resolve(model, contributionResolver);
+                } catch (ContributionResolveException e) {
+                    throw e;
                 } catch (Exception e) {
-                    //FIXME this shouldn't happen
+                    throw new ContributionResolveException(e);
                 }
             }
         }