[camel] branch master updated (b4d34f5 -> d201c89)

[ac...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    omit b4d34f5  Update TwitterConfiguration.java
     new d201c89  Update TwitterConfiguration.java

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (b4d34f5)
            \
             N -- N -- N   refs/heads/master (d201c89)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

-- 
To stop receiving notification emails like this one, please contact
acosentino@apache.org.

[camel] 01/01: Update TwitterConfiguration.java

[ac...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit d201c8941bd8f47e0683f73eafca7b648069a41e
Author: Guilhaumon Arnaud <ar...@gmail.com>
AuthorDate: Fri Apr 20 11:15:55 2018 +0200

    Update TwitterConfiguration.java
    
    Lines 117 and 120 the setters where misconfigured, setting the proxyHost all the time
---
 .../java/org/apache/camel/component/twitter/TwitterConfiguration.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
index 9c51eee..9b5bcc1 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
@@ -114,10 +114,10 @@ public class TwitterConfiguration {
             confBuilder.setHttpProxyHost(getHttpProxyHost());
         }
         if (getHttpProxyUser() != null) {
-            confBuilder.setHttpProxyHost(getHttpProxyUser());
+            confBuilder.setHttpProxyUser(getHttpProxyUser());
         }
         if (getHttpProxyPassword() != null) {
-            confBuilder.setHttpProxyHost(getHttpProxyPassword());
+            confBuilder.setHttpProxyPassword(getHttpProxyPassword());
         }
         if (httpProxyPort != null) {
             confBuilder.setHttpProxyPort(httpProxyPort);

-- 
To stop receiving notification emails like this one, please contact
acosentino@apache.org.