You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2010/12/01 00:26:35 UTC
svn commit: r1040824 - in
/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty:
CamelMultipartFilter.java JettyHttpComponent.java JettyHttpEndpoint.java
Author: hadrian
Date: Tue Nov 30 23:26:35 2010
New Revision: 1040824
URL: http://svn.apache.org/viewvc?rev=1040824&view=rev
Log:
CAMEL-3379. Minor checkstyle fixes
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java?rev=1040824&r1=1040823&r2=1040824&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java Tue Nov 30 23:26:35 2010
@@ -30,13 +30,12 @@ import javax.servlet.ServletResponse;
* Re-dispatched requests are ignored.
*/
class CamelMultipartFilter implements Filter {
-
- private Filter wrapped;
+ private Filter wrapped;
- public CamelMultipartFilter(Filter wrapped) {
- this.wrapped = wrapped;
- }
-
+ public CamelMultipartFilter(Filter wrapped) {
+ this.wrapped = wrapped;
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
if (request.getAttribute(CamelContinuationServlet.EXCHANGE_ATTRIBUTE_NAME) == null) {
wrapped.doFilter(request, response, chain);
@@ -45,12 +44,11 @@ class CamelMultipartFilter implements Fi
}
}
- public void destroy() {
- wrapped.destroy();
- }
-
- public void init(FilterConfig config) throws ServletException {
- wrapped.init(config);
- }
+ public void destroy() {
+ wrapped.destroy();
+ }
+ public void init(FilterConfig config) throws ServletException {
+ wrapped.init(config);
+ }
}
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=1040824&r1=1040823&r2=1040824&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 Tue Nov 30 23:26:35 2010
@@ -195,8 +195,8 @@ public class JettyHttpComponent extends
endpoint.setEnableMultipartFilter(enableMultipartFilter);
if (multipartFilter != null) {
- endpoint.setMultipartFilter(multipartFilter);
- endpoint.setEnableMultipartFilter(true);
+ endpoint.setMultipartFilter(multipartFilter);
+ endpoint.setEnableMultipartFilter(true);
}
setProperties(endpoint, parameters);
@@ -299,8 +299,8 @@ public class JettyHttpComponent extends
// if a filter ref was provided, use it.
Filter filter = ((JettyHttpEndpoint) endpoint).getMultipartFilter();
if (filter == null) {
- // if no filter ref was provided, use the default filter
- filter = new MultiPartFilter();
+ // if no filter ref was provided, use the default filter
+ filter = new MultiPartFilter();
}
filterHolder.setFilter(new CamelMultipartFilter(filter));
String pathSpec = endpoint.getPath();
@@ -311,7 +311,7 @@ public class JettyHttpComponent extends
pathSpec = pathSpec.endsWith("/") ? pathSpec + "*" : pathSpec + "/*";
}
context.addFilter(filterHolder, pathSpec, 0);
- LOG.debug("using multipart filter implementation "+filter.getClass().getName() +" for path "+pathSpec);
+ LOG.debug("using multipart filter implementation " + filter.getClass().getName() + " for path " + pathSpec);
}
/**
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java?rev=1040824&r1=1040823&r2=1040824&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java Tue Nov 30 23:26:35 2010
@@ -126,10 +126,10 @@ public class JettyHttpEndpoint extends H
}
public void setMultipartFilter(Filter filter) {
- this.multipartFilter = filter;
+ this.multipartFilter = filter;
}
public Filter getMultipartFilter() {
- return multipartFilter;
+ return multipartFilter;
}
}