Author: svkrish
Date: Tue Apr 8 22:28:36 2008
New Revision: 646190
URL: http://svn.apache.org/viewvc?rev=646190&view=rev
Log:
applied patch from https://issues.apache.org/jira/browse/TUSCANY-1802
Modified:
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
Modified:
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java?rev=646190&r1=646189&r2=646190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
Tue Apr 8 22:28:36 2008
@@ -28,5 +28,12 @@
public SpringBeanNotFoundException(String msg) {
super(msg);
}
-
+
+ public SpringBeanNotFoundException(Throwable e) {
+ super(e);
+ }
+
+ public SpringBeanNotFoundException(String msg, Throwable e) {
+ super(msg,e);
+ }
}
Modified:
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java?rev=646190&r1=646189&r2=646190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
Tue Apr 8 22:28:36 2008
@@ -28,5 +28,13 @@
public SpringInvocationException(String msg) {
super(msg);
}
+
+ public SpringInvocationException(Throwable e) {
+ super(e);
+ }
+
+ public SpringInvocationException(String msg,Throwable e) {
+ super(msg,e);
+ }
}
Modified:
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java?rev=646190&r1=646189&r2=646190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
Tue Apr 8 22:28:36 2008
@@ -71,16 +71,16 @@
} // end constructor SpringInvoker
// Lazy-load the method to avoid timing problems with the Spring Context
- private void setupMethod() {
+ private void setupMethod() throws SpringInvocationException{
try {
bean = springContext.getBean(beanElement.getId());
Class<?> beanClass = bean.getClass();
theMethod = JavaInterfaceUtil.findMethod(beanClass, operation);
//System.out.println("SpringInvoker - found method " +
theMethod.getName() );
} catch (BeansException e) {
- badInvoker = true;
+ throw new SpringInvocationException(e);
} catch (NoSuchMethodException e) {
- badInvoker = true;
+ throw new SpringInvocationException(e);
}
}
@@ -101,9 +101,9 @@
}
return ret;
} catch (InvocationTargetException e) {
- throw new SpringInvocationException(e.getMessage());
+ throw new SpringInvocationException("Spring invoker invoke method
'"+ theMethod.getName()+"' error.",e);
} catch (Exception e) {
- throw new SpringInvocationException(e.getMessage());
+ throw new SpringInvocationException("Spring invoker invoke method
'"+ theMethod.getName()+"' error.",e);
}
} // end method doInvoke
@@ -117,6 +117,8 @@
msg.setBody(resp);
} catch (SpringInvocationException e) {
msg.setFaultBody(e.getCause());
+ }catch (Throwable e) {
+ msg.setFaultBody(e);
}
//System.out.println("Spring Invoker - invoke called");
return msg;
Modified:
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java?rev=646190&r1=646189&r2=646190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
Tue Apr 8 22:28:36 2008
@@ -28,5 +28,13 @@
public SpringOperationNotFoundException(String msg) {
super(msg);
}
+
+ public SpringOperationNotFoundException(Throwable e) {
+ super(e);
+ }
+
+ public SpringOperationNotFoundException(String msg,Throwable e) {
+ super(msg,e);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
