svn commit: r833419 - /camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java

[davsclaus-2]

Author: davsclaus
Date: Fri Nov  6 14:45:05 2009
New Revision: 833419

URL: http://svn.apache.org/viewvc?rev=833419&view=rev
Log:
CAMEL-2145: Fixed http uri could contain parameters which are for Camel and not the remote http server

Modified:
    camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java

Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=833419&r1=833418&r2=833419&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java Fri Nov  6 14:45:05 2009
@@ -107,11 +107,7 @@
         // configure regular parameters
         configureParameters(parameters);
 
-        // restructure uri to be based on the parameters left as we dont want to include the Camel internal options
-        URI httpUri = URISupport.createRemainingURI(new URI(UnsafeUriCharactersEncoder.encode(uri)), parameters);
-        uri = httpUri.toString();
-
-        JettyHttpEndpoint result = new JettyHttpEndpoint(this, uri, httpUri, params, getHttpConnectionManager(), httpClientConfigurer);
+        JettyHttpEndpoint result = new JettyHttpEndpoint(this, uri, null, params, getHttpConnectionManager(), httpClientConfigurer);
         if (httpBinding != null) {
             result.setBinding(httpBinding);
         }
@@ -120,6 +116,11 @@
             result.setHandlers(handlerList);
         }
         setProperties(result, parameters);
+
+        // create the http uri after we have configured all the parameters on the camel objects
+        URI httpUri = URISupport.createRemainingURI(new URI(UnsafeUriCharactersEncoder.encode(uri)), parameters);
+        result.setHttpUri(httpUri);
+
         return result;
     }
 
@@ -278,6 +279,8 @@
         sslSocketConnectors = connectors;
     }
 
+    // Implementation methods
+    // -------------------------------------------------------------------------
     protected CamelServlet createServletForConnector(Server server, Connector connector, List<Handler> handlers) throws Exception {
         CamelServlet camelServlet = new CamelServlet();
 
@@ -299,8 +302,6 @@
         return camelServlet;
     }
     
-    // Implementation methods
-    // -------------------------------------------------------------------------
     protected Server createServer() throws Exception {
         Server server = new Server();
         ContextHandlerCollection collection = new ContextHandlerCollection();
@@ -309,5 +310,4 @@
         server.start();
         return server;
     }
-  
 }