From b45e75d8ce08d25ee71382ccb18a5e9b748afea9 Mon Sep 17 00:00:00 2001 From: antelder Date: Wed, 6 Oct 2010 16:24:19 +0000 Subject: Merge TUSCANY-3698 fix from 1.x trunk to 1.6.1 branch. Have tested with a full build which wen through fine, jms samples run and the jms webapp one works ok in tomcat git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1005108 13f79535-47bb-0310-9956-ffa450edef68 --- .../jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sca-java-1.x/branches/sca-java-1.6.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding') diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java index bb853673e8..c1bb35636f 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java @@ -103,7 +103,7 @@ public class HelloWorldReferenceImpl implements HelloWorldReference { try { helloWorldServiceDontWrapSingle.throwUnChecked(person); } catch (Exception e) { - returnString += " " + e.getCause().getMessage(); + returnString += " " + (e.getCause().getMessage().startsWith("Message = java.lang.RuntimeException: bla") ? "java.lang.RuntimeException: bla" : e.getCause().getMessage()); } return returnString; -- cgit v1.2.3