svn commit: r1396541 - in /cxf/branches/2.5.x-fixes/rt: core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java

[co...@apache.org]

Author: coheigea
Date: Wed Oct 10 10:56:12 2012
New Revision: 1396541

URL: http://svn.apache.org/viewvc?rev=1396541&view=rev
Log:
Merged revisions 1396537 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1396537 | coheigea | 2012-10-10 11:38:31 +0100 (Wed, 10 Oct 2012) | 10 lines

  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.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
    cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java?rev=1396541&r1=1396540&r2=1396541&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java (original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java Wed Oct 10 10:56:12 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.5.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.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java?rev=1396541&r1=1396540&r2=1396541&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java Wed Oct 10 10:56:12 2012
@@ -45,6 +45,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.impl.MetadataMap;
@@ -771,12 +772,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);
@@ -784,8 +783,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);