svn commit: r959857 - in /cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src: main/java/org/apache/cxf/transport/http_osgi/ test/java/org/apache/cxf/transport/http_osgi/

[ffang]

Author: ffang
Date: Fri Jul  2 05:16:48 2010
New Revision: 959857

URL: http://svn.apache.org/viewvc?rev=959857&view=rev
Log:
[CXF-2861]http-osgi transport doesn't set conduitInitiator correctly

Modified:
    
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
    
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java
    
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/OsgiDestinationTest.java

Modified: 
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java?rev=959857&r1=959856&r2=959857&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
 Fri Jul  2 05:16:48 2010
@@ -49,12 +49,13 @@ public class OsgiDestination extends Abs
      * @throws IOException
      */
     public OsgiDestination(Bus b,
+                           OsgiTransportFactory osgiTransportFactory, 
                            EndpointInfo ei,
                            OsgiDestinationRegistryIntf fact,
                            String p)
         throws IOException {
         // would add the default port to the address
-        super(b, null, ei, false);
+        super(b, osgiTransportFactory, ei, false);
         factory = fact;
         path = p;
     }

Modified: 
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java?rev=959857&r1=959856&r2=959857&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java
 Fri Jul  2 05:16:48 2010
@@ -42,7 +42,7 @@ public class OsgiTransportFactory extend
         OsgiDestination d = 
registry.getDestinationForPath(endpointInfo.getAddress());
         if (d == null) {
             String path = 
OsgiDestinationRegistry.getTrimmedPath(endpointInfo.getAddress());
-            d = new OsgiDestination(getBus(), endpointInfo, registry, path);
+            d = new OsgiDestination(getBus(), this, endpointInfo, registry, 
path);
             registry.addDestination(path, d);
         }
         return d;

Modified: 
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/OsgiDestinationTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/OsgiDestinationTest.java?rev=959857&r1=959856&r2=959857&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/OsgiDestinationTest.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/OsgiDestinationTest.java
 Fri Jul  2 05:16:48 2010
@@ -44,6 +44,7 @@ public class OsgiDestinationTest extends
     private Bus bus;
     private OsgiDestinationRegistryIntf registry;
     private MessageObserver observer;
+    private OsgiTransportFactory osgiTransportFactory;
     private EndpointInfo endpoint;
 
     @Before
@@ -52,6 +53,7 @@ public class OsgiDestinationTest extends
         bus = control.createMock(Bus.class);
         registry = control.createMock(OsgiDestinationRegistryIntf.class);
         observer = control.createMock(MessageObserver.class);
+        osgiTransportFactory = control.createMock(OsgiTransportFactory.class);
         endpoint = new EndpointInfo();
         endpoint.setAddress(ADDRESS);
     }
@@ -66,7 +68,7 @@ public class OsgiDestinationTest extends
     @Test
     public void testCtor() throws Exception {
         OsgiDestination destination = 
-            new OsgiDestination(bus, endpoint, registry, "snafu");
+            new OsgiDestination(bus, osgiTransportFactory, endpoint, registry, 
"snafu");
 
         assertNull(destination.getMessageObserver());
         assertNotNull(destination.getAddress());
@@ -82,7 +84,7 @@ public class OsgiDestinationTest extends
         control.replay();
 
         OsgiDestination destination = 
-            new OsgiDestination(bus, endpoint, registry, "snafu");
+            new OsgiDestination(bus, osgiTransportFactory, endpoint, registry, 
"snafu");
         destination.setMessageObserver(observer);
 
         destination.doMessage(message);
@@ -97,7 +99,7 @@ public class OsgiDestinationTest extends
         control.replay();
 
         OsgiDestination destination = 
-            new OsgiDestination(bus, endpoint, registry, "snafu");
+            new OsgiDestination(bus, osgiTransportFactory, endpoint, registry, 
"snafu");
 
         destination.shutdown();