You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dh...@apache.org on 2015/03/20 21:43:16 UTC

[2/3] camel git commit: CAMEL-8519: Fixed salesforce security listener to replace OAuth header

CAMEL-8519: Fixed salesforce security listener to replace OAuth header


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

Branch: refs/heads/camel-2.15.x
Commit: eeca81a9cfaa27f1634b3c3761595847fe5b668a
Parents: 9d55b69
Author: Dhiraj Bokde <dh...@yahoo.com>
Authored: Fri Mar 20 09:54:57 2015 -0700
Committer: Dhiraj Bokde <dh...@yahoo.com>
Committed: Fri Mar 20 13:39:21 2015 -0700

----------------------------------------------------------------------
 .../salesforce/internal/client/SalesforceSecurityListener.java   | 4 ++--
 .../salesforce/internal/streaming/SubscriptionHelper.java        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/eeca81a9/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
index 552401c..27d838a 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
@@ -103,8 +103,8 @@ public class SalesforceSecurityListener extends HttpEventListenerWrapper {
                     client.setInstanceUrl(session.getInstanceUrl());
                     client.setAccessToken(exchange);
                 } else {
-                    exchange.addRequestHeader(HttpHeaders.AUTHORIZATION,
-                            "OAuth " + currentToken);
+                    exchange.setRequestHeader(HttpHeaders.AUTHORIZATION,
+                        "OAuth " + currentToken);
                 }
 
                 // TODO handle a change in Salesforce instanceUrl, right now we retry with the same destination

http://git-wip-us.apache.org/repos/asf/camel/blob/eeca81a9/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 7aaa086..b0ed0d6 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -213,7 +213,7 @@ public class SubscriptionHelper extends ServiceSupport {
                 }
 
                 // add current security token obtained from session
-                exchange.addRequestHeader(HttpHeaders.AUTHORIZATION,
+                exchange.setRequestHeader(HttpHeaders.AUTHORIZATION,
                         "OAuth " + accessToken);
             }
         };