servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r799242 - in /servicemix/components/bindings/servicemix-cxf-bc/trunk: ./ src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiInWsdl1Interceptor.java src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
Date Thu, 30 Jul 2009 11:38:25 GMT
Author: gertv
Date: Thu Jul 30 11:38:25 2009
New Revision: 799242

URL: http://svn.apache.org/viewvc?rev=799242&view=rev
Log:
SMXCOMP-609: CxfBcProviderConsumerTest fails on IBM JDK

Modified:
    servicemix/components/bindings/servicemix-cxf-bc/trunk/   (props changed)
    servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiInWsdl1Interceptor.java
    servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java

Propchange: servicemix/components/bindings/servicemix-cxf-bc/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 30 11:38:25 2009
@@ -7,3 +7,5 @@
 .settings
 eclipse-classes
 *.iml
+jms
+data

Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiInWsdl1Interceptor.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiInWsdl1Interceptor.java?rev=799242&r1=799241&r2=799242&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiInWsdl1Interceptor.java
(original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiInWsdl1Interceptor.java
Thu Jul 30 11:38:25 2009
@@ -286,7 +286,11 @@
             message.setContent(Source.class, new DOMSource(doc));
             message.put("jbiFault", true);
         } catch (Exception e) {
-            throw new RuntimeException("the fault message can't be parsed:" + e.getMessage());
+            String eMessage = e.getMessage();
+            if (eMessage == null) {
+                eMessage = e.getClass().getName();
+            }
+            throw new RuntimeException("the fault message can't be parsed:" + eMessage);
             
         }
     }

Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java?rev=799242&r1=799241&r2=799242&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
(original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
Thu Jul 30 11:38:25 2009
@@ -66,7 +66,9 @@
             port.add(1, -2);
             fail("should get exception");
         } catch (Exception e) {
-            assertEquals(e.getMessage(), "the fault message can't be parsed:String index
out of range: -1");
+            String expected = "the fault message can't be parsed:";
+            assertTrue("Exception did not contain expected text. expected: " 
+                + expected + " was: " + e.getMessage(), e.getMessage().contains(expected));
         }
 
     }



Mime
View raw message