From 69e54c84cf368291d94c5a6c4a61b693f7867770 Mon Sep 17 00:00:00 2001
From: edwardsmj <edwardsmj@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 7 May 2009 06:50:42 +0000
Subject: Added exception handling during resolve phase to improve error
 reporting

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@772522 13f79535-47bb-0310-9956-ffa450edef68
---
 .../interfacedef/java/xml/JavaInterfaceProcessor.java   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'java/sca')

diff --git a/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index a86412e9ac..34811ff3fe 100644
--- a/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
@@ -174,13 +174,16 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa
     }
     
     public void resolve(JavaInterfaceContract javaInterfaceContract, ModelResolver resolver) throws ContributionResolveException {
-        
-        // Resolve the interface and callback interface
-        JavaInterface javaInterface = resolveJavaInterface((JavaInterface)javaInterfaceContract.getInterface(), resolver);
-        javaInterfaceContract.setInterface(javaInterface);
-        
-        JavaInterface javaCallbackInterface = resolveJavaInterface((JavaInterface)javaInterfaceContract.getCallbackInterface(), resolver);
-        javaInterfaceContract.setCallbackInterface(javaCallbackInterface);
+        try {
+	        // Resolve the interface and callback interface
+	        JavaInterface javaInterface = resolveJavaInterface((JavaInterface)javaInterfaceContract.getInterface(), resolver);
+	        javaInterfaceContract.setInterface(javaInterface);
+	        
+	        JavaInterface javaCallbackInterface = resolveJavaInterface((JavaInterface)javaInterfaceContract.getCallbackInterface(), resolver);
+	        javaInterfaceContract.setCallbackInterface(javaCallbackInterface);
+        } catch (Exception e) {
+        	throw new ContributionResolveException( "Resolving Java Interface " + javaInterfaceContract.getInterface().toString(), e );
+        } // end try
     }
     
     public QName getArtifactType() {
-- 
cgit v1.2.3