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 75277D7EF for ; Wed, 10 Oct 2012 10:27:53 +0000 (UTC) Received: (qmail 68155 invoked by uid 500); 10 Oct 2012 10:27:53 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 67938 invoked by uid 500); 10 Oct 2012 10:27:48 -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 67914 invoked by uid 99); 10 Oct 2012 10:27:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Oct 2012 10:27:47 +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; Wed, 10 Oct 2012 10:27:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DAC92238890D; Wed, 10 Oct 2012 10:27:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1396535 - in /cxf/trunk: api/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java Date: Wed, 10 Oct 2012 10:27:02 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121010102702.DAC92238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Wed Oct 10 10:27:02 2012 New Revision: 1396535 URL: http://svn.apache.org/viewvc?rev=1396535&view=rev Log: Fix IBM JDK test failures in rt/frontend/jaxrs Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java?rev=1396535&r1=1396534&r2=1396535&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java Wed Oct 10 10:27:02 2012 @@ -47,7 +47,9 @@ public abstract class AbstractFaultChain public AbstractFaultChainInitiatorObserver(Bus bus) { this.bus = bus; - loader = bus.getExtension(ClassLoader.class); + if (bus != null) { + loader = bus.getExtension(ClassLoader.class); + } } public void onMessage(Message message) { Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java?rev=1396535&r1=1396534&r2=1396535&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java Wed Oct 10 10:27:02 2012 @@ -41,6 +41,7 @@ import org.w3c.dom.Element; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.common.xmlschema.XmlSchemaConstants; import org.apache.cxf.endpoint.Endpoint; +import org.apache.cxf.endpoint.EndpointImpl; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.jaxrs.JAXRSServiceImpl; import org.apache.cxf.jaxrs.model.ClassResourceInfo; @@ -753,12 +754,10 @@ public class WadlGeneratorTest extends A private Message mockMessage(String baseAddress, String pathInfo, String query, - List cris) { + List cris) throws Exception { Message m = new MessageImpl(); Exchange e = new ExchangeImpl(); e.put(Service.class, new JAXRSServiceImpl(cris)); - Endpoint endpoint = control.createMock(Endpoint.class); - e.put(Endpoint.class, endpoint); m.setExchange(e); control.reset(); ServletDestination d = control.createMock(ServletDestination.class); @@ -766,8 +765,10 @@ public class WadlGeneratorTest extends A epr.setAddress(baseAddress); d.getEndpointInfo(); EasyMock.expectLastCall().andReturn(epr).anyTimes(); - endpoint.getEndpointInfo(); - EasyMock.expectLastCall().andReturn(epr).anyTimes(); + + Endpoint endpoint = new EndpointImpl(null, null, epr); + e.put(Endpoint.class, endpoint); + e.setDestination(d); BindingInfo bi = control.createMock(BindingInfo.class); epr.setBinding(bi);