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

[sergeyb]

Author: sergeyb
Date: Tue Oct  6 18:07:41 2009
New Revision: 822389

URL: http://svn.apache.org/viewvc?rev=822389&view=rev
Log:
Merged revisions 822377 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r822377 | sergeyb | 2009-10-06 18:55:20 +0100 (Tue, 06 Oct 2009) | 1 line
  
  Fixing the test failure
........

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
    
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractServletController.java
    
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  6 18:07:41 2009
@@ -1 +1 @@
-/cxf/trunk:822228,822312,822353
+/cxf/trunk:822228,822312,822353,822377

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=822389&r1=822388&r2=822389&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
 Tue Oct  6 18:07:41 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/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractServletController.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractServletController.java?rev=822389&r1=822388&r2=822389&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractServletController.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractServletController.java
 Tue Oct  6 18:07:41 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/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=822389&r1=822388&r2=822389&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
 Tue Oct  6 18:07:41 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);
+    }
+    
 }