You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/10/10 12:38:32 UTC
svn commit: r1396537 - in /cxf/branches/2.6.x-fixes:
api/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
Author: coheigea
Date: Wed Oct 10 10:38:31 2012
New Revision: 1396537
URL: http://svn.apache.org/viewvc?rev=1396537&view=rev
Log:
Merged revisions 1396535 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1396535 | coheigea | 2012-10-10 11:27:02 +0100 (Wed, 10 Oct 2012) | 2 lines
Fix IBM JDK test failures in rt/frontend/jaxrs
........
Modified:
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java?rev=1396537&r1=1396536&r2=1396537&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java Wed Oct 10 10:38:31 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/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java?rev=1396537&r1=1396536&r2=1396537&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java Wed Oct 10 10:38:31 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;
@@ -736,12 +737,10 @@ public class WadlGeneratorTest extends A
private Message mockMessage(String baseAddress, String pathInfo, String query,
- List<ClassResourceInfo> cris) {
+ List<ClassResourceInfo> 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);
@@ -749,8 +748,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);