You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/09/28 07:42:37 UTC

[3/4] camel git commit: Fixed CS. This closes #624.

Fixed CS. This closes #624.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6ffcaccc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6ffcaccc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6ffcaccc

Branch: refs/heads/master
Commit: 6ffcaccc3dfae27cb3465509738952b33e3c5315
Parents: 91812a5
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Sep 28 07:22:29 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Sep 28 07:22:29 2015 +0200

----------------------------------------------------------------------
 .../camel/component/netty/http/NettyHttpComponent.java       | 8 ++++----
 .../camel/component/netty4/http/NettyHttpComponent.java      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/6ffcaccc/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index 2763256..370c6c8 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -272,10 +272,10 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
         }
 
         String contextPath = config.getContextPath();
-        if(ObjectHelper.isNotEmpty(contextPath)) {
-        	contextPath = FileUtil.stripTrailingSeparator(contextPath);
-        	contextPath = FileUtil.stripLeadingSeparator(contextPath);
-        	path =  contextPath + "/" + path;
+        if (ObjectHelper.isNotEmpty(contextPath)) {
+            contextPath = FileUtil.stripTrailingSeparator(contextPath);
+            contextPath = FileUtil.stripLeadingSeparator(contextPath);
+            path = contextPath + "/" + path;
         }
         
         // if no explicit hostname set then resolve the hostname

http://git-wip-us.apache.org/repos/asf/camel/blob/6ffcaccc/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
index bf104c4..1f8e397 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
@@ -271,10 +271,10 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
         }
 
         String contextPath = config.getContextPath();
-        if(ObjectHelper.isNotEmpty(contextPath)) {
-        	contextPath = FileUtil.stripTrailingSeparator(contextPath);
-        	contextPath = FileUtil.stripLeadingSeparator(contextPath);
-        	path =  contextPath + "/" + path;
+        if (ObjectHelper.isNotEmpty(contextPath)) {
+            contextPath = FileUtil.stripTrailingSeparator(contextPath);
+            contextPath = FileUtil.stripLeadingSeparator(contextPath);
+            path = contextPath + "/" + path;
         }
         
         // if no explicit hostname set then resolve the hostname