Author: dkulp Date: Mon Sep 14 16:10:15 2009 New Revision: 814721 URL: http://svn.apache.org/viewvc?rev=814721&view=rev Log: Merged revisions 814716 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r814716 | dkulp | 2009-09-14 12:03:36 -0400 (Mon, 14 Sep 2009) | 14 lines Merged revisions 814661 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r814661 | peterjones | 2009-09-14 10:29:10 -0400 (Mon, 14 Sep 2009) | 7 lines Some ibm jdk 5 fixes. DataBindingProviderTest - string comparison of xml in test fails for ibm jdk. JMSConduitTest - work-around for ibm jdk finalizing the conduit while it is still in scope in the test. AegisDatabinding - Need to add a null check so that the simple frontend dependency can be excluded with the ibm jdk. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java Propchange: cxf/branches/2.1.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=814721&r1=814720&r2=814721&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java (original) +++ cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java Mon Sep 14 16:10:15 2009 @@ -637,6 +637,14 @@ private Method getMethod(Service s, OperationInfo op) { MethodDispatcher md = (MethodDispatcher)s.get(MethodDispatcher.class.getName()); + // The ibm jdk requires the simple frontend dependency to be + // present for the SimpleMethodDispatcher cast below even if + // md is null (sun jdk does not). So, for the jaxrs frontend, + // we can exclude the simple frontend from the aegis databinding + // dependency as long as this null check is here. + if (md == null) { + return null; + } SimpleMethodDispatcher smd = (SimpleMethodDispatcher)md; return smd.getPrimaryMethod(op); } Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java?rev=814721&r1=814720&r2=814721&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java (original) +++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java Mon Sep 14 16:10:15 2009 @@ -178,6 +178,12 @@ return JMSUtils.createAndSetPayload(testBytes, session, JMSConstants.BYTE_MESSAGE_TYPE); } }); + + // The ibm jdk finalizes conduit (during most runs of this test) and + // causes it to fail unless we reference the conduit here after the + // jmsTemplate.execute() call. + assertNotNull("Conduit is null", conduit); + assertTrue("Message should have been of type BytesMessage ", message instanceof BytesMessage); }
