You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/11/16 16:58:35 UTC
svn commit: r1410413 -
/cxf/branches/2.6.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
Author: dkulp
Date: Fri Nov 16 15:58:35 2012
New Revision: 1410413
URL: http://svn.apache.org/viewvc?rev=1410413&view=rev
Log:
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.6.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
Modified: cxf/branches/2.6.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java?rev=1410413&r1=1410412&r2=1410413&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java (original)
+++ cxf/branches/2.6.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java Fri Nov 16 15:58:35 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();
}