cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1415221 - /cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Date Thu, 29 Nov 2012 15:57:03 GMT
Author: sergeyb
Date: Thu Nov 29 15:57:02 2012
New Revision: 1415221

URL: http://svn.apache.org/viewvc?rev=1415221&view=rev
Log:
[CXF-4643] Updating ServletController to check for custom query handlers only if HTTP method
is GET

Modified:
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java

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=1415221&r1=1415220&r2=1415221&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
Thu Nov 29 15:57:02 2012
@@ -176,14 +176,12 @@ public class ServletController {
                             orig = ClassLoaderUtils.setThreadContextClassloader(loader);
                         }
                     }
+                    updateDestination(request, d);
+                    
                     QueryHandlerRegistry queryHandlerRegistry = bus.getExtension(QueryHandlerRegistry.class);
-
-                    if (!StringUtils.isEmpty(request.getQueryString()) && queryHandlerRegistry
!= null) {
-                        
-                        // update the EndPoint Address with request url
-                        if ("GET".equals(request.getMethod())) {
-                            updateDestination(request, d);
-                        }
+                    if ("GET".equals(request.getMethod()) 
+                        && !StringUtils.isEmpty(request.getQueryString()) 
+                        && queryHandlerRegistry != null) {
                         
                         String ctxUri = request.getPathInfo();
                         String baseUri = request.getRequestURL().toString()
@@ -196,8 +194,6 @@ public class ServletController {
                             respondUsingQueryHandler(selectedHandler, res, ei, ctxUri, baseUri);
                             return true;
                         }
-                    } else {
-                        updateDestination(request, d);
                     }
                     invokeDestination(request, res, d);
                 } finally {



Mime
View raw message