You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by on...@apache.org on 2017/07/22 16:48:36 UTC

camel git commit: CAMEL-11531-merge and polish [Forced Update!]

Repository: camel
Updated Branches:
  refs/heads/master e6d75356d -> 5e875e96f (forced update)


CAMEL-11531-merge and polish


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

Branch: refs/heads/master
Commit: 5e875e96f1f4088104aba7c24d2e997dfa90b429
Parents: 617cfbb 383bad0
Author: onders86 <on...@gmail.com>
Authored: Sat Jul 22 19:18:56 2017 +0300
Committer: onders86 <on...@gmail.com>
Committed: Sat Jul 22 19:41:49 2017 +0300

----------------------------------------------------------------------
 components/camel-http-common/pom.xml                    |  1 +
 .../camel/http/common/cookie/CookieHandlerTest.java     |  3 +--
 .../components-starter/camel-servlet-starter/pom.xml    | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/5e875e96/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java
----------------------------------------------------------------------
diff --cc components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java
index 5e38584,1ee9d61..2b11f93
--- a/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java
+++ b/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java
@@@ -39,8 -39,9 +39,7 @@@ public class CookieHandlerTest extends 
      private CookieHandler cookieHandler;
      private CookiePolicy cookiePolicy;
      private int expectedNumberOfCookieValues;
 -
 +    private String uriStr;
- 
      private Exchange exchange;
  
      public CookieHandlerTest(CookieHandler cookieHandler, CookiePolicy cookiePolicy, String uri, int expectedNumberOfCookieValues, String description) {