cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1410476 - /cxf/branches/2.5.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
Date Fri, 16 Nov 2012 17:14:15 GMT
Author: dkulp
Date: Fri Nov 16 17:14:14 2012
New Revision: 1410476

URL: http://svn.apache.org/viewvc?rev=1410476&view=rev
Log:
Merged revisions 1410413 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1410413 | dkulp | 2012-11-16 10:58:35 -0500 (Fri, 16 Nov 2012) | 10 lines

  Merged revisions 1410158 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1410158 | dkulp | 2012-11-15 21:06:31 -0500 (Thu, 15 Nov 2012) | 2 lines

    Another random failure on IBM7 JDK

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java

Modified: cxf/branches/2.5.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java?rev=1410476&r1=1410475&r2=1410476&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
(original)
+++ cxf/branches/2.5.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
Fri Nov 16 17:14:14 2012
@@ -672,16 +672,18 @@ public class WSDLToIDLGenerationTest ext
             idlgen.setGenerateAllBindings(true);            
             idlgen.generateIDL(null);
 
-            InputStream origstream;
-            if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
-                // The ibm jdk outputs the idl modules in a different order
+            InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_multiplebinding.idl");
+            byte orig[] = inputStreamToBytes(origstream);
+            
+            try {
+                checkIDLStrings(orig, idloutput.toByteArray());           
+            } catch (Throwable ex) {
+                // The ibm jdk SOMTIMES outputs the idl modules in a different order
                 // (still valid idl).
                 origstream = getClass().getResourceAsStream("/idlgen/expected_multiplebinding_ibmjdk.idl");
-            } else {
-                origstream = getClass().getResourceAsStream("/idlgen/expected_multiplebinding.idl");
+                orig = inputStreamToBytes(origstream);
+                checkIDLStrings(orig, idloutput.toByteArray());    
             }
-            byte orig[] = inputStreamToBytes(origstream);
-            checkIDLStrings(orig, idloutput.toByteArray());           
         } finally {
             new File("multiplebinding.idl").deleteOnExit();
         }



Mime
View raw message