You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2009/10/06 19:55:21 UTC
svn commit: r822377 - in /cxf/trunk/rt/transports:
http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/
http/src/main/java/org/apache/cxf/transport/servlet/
Author: sergeyb
Date: Tue Oct 6 17:55:20 2009
New Revision: 822377
URL: http://svn.apache.org/viewvc?rev=822377&view=rev
Log:
Fixing the test failure
Modified:
cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiServletController.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractServletController.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Modified: cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiServletController.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiServletController.java?rev=822377&r1=822376&r2=822377&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiServletController.java (original)
+++ cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiServletController.java Tue Oct 6 17:55:20 2009
@@ -281,9 +281,8 @@
inMessage.setContent(InputStream.class, request.getInputStream());
inMessage.put(AbstractHTTPDestination.HTTP_REQUEST, request);
inMessage.put(AbstractHTTPDestination.HTTP_RESPONSE, response);
- inMessage.put(AbstractHTTPDestination.HTTP_CONTEXT,
- servletConfig == null ? null : servletConfig.getServletContext());
- inMessage.put(AbstractHTTPDestination.HTTP_CONFIG, servletConfig);
+ inMessage.put(AbstractHTTPDestination.HTTP_CONTEXT, servlet.getServletContext());
+ inMessage.put(AbstractHTTPDestination.HTTP_CONFIG, servlet.getServletConfig());
inMessage.put(Message.HTTP_REQUEST_METHOD, request.getMethod());
inMessage.put(Message.REQUEST_URI, request.getRequestURI());
inMessage.put(Message.PATH_INFO, request.getPathInfo());
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractServletController.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractServletController.java?rev=822377&r1=822376&r2=822377&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractServletController.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractServletController.java Tue Oct 6 17:55:20 2009
@@ -32,15 +32,13 @@
protected String forcedBaseAddress;
protected String serviceListStyleSheet;
protected String serviceListRelativePath = DEFAULT_LISTINGS_CLASSIFIER;
- protected ServletConfig servletConfig;
protected AbstractServletController() {
}
protected AbstractServletController(ServletConfig config) {
- this.servletConfig = config;
- init();
+ init(config);
}
public void setHideServiceList(boolean generate) {
@@ -61,7 +59,7 @@
this.serviceListStyleSheet = serviceListStyleSheet;
}
- private void init() {
+ private void init(ServletConfig servletConfig) {
if (servletConfig == null) {
return;
}
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=822377&r1=822376&r2=822377&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Tue Oct 6 17:55:20 2009
@@ -66,6 +66,7 @@
this.servletConfig = config;
this.servletContext = context;
this.bus = b;
+ init();
}
ServletController() {
@@ -400,4 +401,8 @@
}
+ private void init() {
+ transport.setServletController(this);
+ }
+
}