Author: hadrian
Date: Sat Mar 31 20:58:53 2012
New Revision: 1307901

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

........
  r1291121 | ningjiang | 2012-02-19 21:49:05 -0500 (Sun, 19 Feb 2012) | 1 line
  
  CAMEL-5016 Updated the API call of ServletContextHandler.addFilter
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=1307901&r1=1307900&r2=1307901&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 Sat Mar 31 20:58:53 2012
@@ -370,7 +370,7 @@ public class JettyHttpComponent extends 
             if (endpoint.isMatchOnUriPrefix()) {
                 pathSpec = pathSpec.endsWith("/") ? pathSpec + "*" : pathSpec 
+ "/*";
             }
-            context.addFilter(filterHolder, pathSpec, 0);
+            context.addFilter(filterHolder, pathSpec, null);
         }
         
     }
@@ -404,7 +404,7 @@ public class JettyHttpComponent extends 
         if (endpoint.isMatchOnUriPrefix()) {
             pathSpec = pathSpec.endsWith("/") ? pathSpec + "*" : pathSpec + 
"/*";
         }
-        context.addFilter(filterHolder, pathSpec, 0);
+        context.addFilter(filterHolder, pathSpec, null);
         LOG.debug("using multipart filter implementation " + 
filter.getClass().getName() + " for path " + pathSpec);
     }
 


Reply via email to