Author: ffang
Date: Thu Aug 26 03:38:56 2010
New Revision: 989437
URL: http://svn.apache.org/viewvc?rev=989437&view=rev
Log:
Merged revisions 989436 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r989436 | ffang | 2010-08-26 11:28:18 +0800 (四, 26 8 2010) | 1 line
[CXF-2947]http-osgi transport doesn't updateDests correct for the second
service
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiServletController.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiServletController.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/OsgiServletController.java?rev=989437&r1=989436&r2=989437&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiServletController.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiServletController.java
Thu Aug 26 03:38:56 2010
@@ -53,8 +53,7 @@ import org.apache.cxf.wsdl.http.AddressT
public class OsgiServletController extends AbstractServletController {
private static final Logger LOG = LogUtils.getL7dLogger(OsgiServlet.class);
-
- private volatile String lastBase = "";
+
private OsgiServlet servlet;
public OsgiServletController(OsgiServlet servlet) {
super(servlet.getServletConfig());
@@ -67,23 +66,18 @@ public class OsgiServletController exten
}
String base = forcedBaseAddress == null ? getBaseURL(request) :
forcedBaseAddress;
- if (base.equals(lastBase)) {
- return;
- }
-
+
Set<String> paths = servlet.getTransport().getDestinationsPaths();
for (String path : paths) {
OsgiDestination d2 =
servlet.getTransport().getDestinationForPath(path);
String ad = d2.getEndpointInfo().getAddress();
- if (ad.equals(path)
- || ad.equals(lastBase + path)) {
+ if (ad.equals(path)) {
d2.getEndpointInfo().setAddress(base + path);
if (d2.getEndpointInfo().getExtensor(AddressType.class) !=
null) {
d2.getEndpointInfo().getExtensor(AddressType.class).setLocation(base + path);
}
}
}
- lastBase = base;
}
public void invoke(HttpServletRequest request, HttpServletResponse res)
throws ServletException {
