Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5393BD829 for ; Fri, 16 Nov 2012 15:58:58 +0000 (UTC) Received: (qmail 65975 invoked by uid 500); 16 Nov 2012 15:58:58 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 65795 invoked by uid 500); 16 Nov 2012 15:58:57 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 65507 invoked by uid 99); 16 Nov 2012 15:58:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Nov 2012 15:58:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Nov 2012 15:58:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C918A2388980; Fri, 16 Nov 2012 15:58:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1410413 - /cxf/branches/2.6.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java Date: Fri, 16 Nov 2012 15:58:35 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121116155835.C918A2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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(); }