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 17:57:21 UTC
[1/2] camel git commit: CAMEL-8519: Fixed salesforce security
listener to replace OAuth header
Repository: camel
Updated Branches:
refs/heads/master 2b6bf5f8c -> 781e2c1f2
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/84340b3f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/84340b3f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/84340b3f
Branch: refs/heads/master
Commit: 84340b3f05d39437b725f2f5510f44e862f98b19
Parents: 2b6bf5f
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 09:54:57 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/84340b3f/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/84340b3f/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);
}
};
[2/2] camel git commit: CAMEL-8517: Updated SalesforceSession to use
volatile shared fields
Posted by dh...@apache.org.
CAMEL-8517: Updated SalesforceSession to use volatile shared fields
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/781e2c1f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/781e2c1f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/781e2c1f
Branch: refs/heads/master
Commit: 781e2c1f29bd80ba82d963b8d9ea44a5af7f02b9
Parents: 84340b3
Author: Dhiraj Bokde <dh...@yahoo.com>
Authored: Fri Mar 20 09:57:03 2015 -0700
Committer: Dhiraj Bokde <dh...@yahoo.com>
Committed: Fri Mar 20 09:57:03 2015 -0700
----------------------------------------------------------------------
.../component/salesforce/internal/SalesforceSession.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/781e2c1f/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
index 5dcb68b..2364697 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
@@ -56,8 +56,8 @@ public class SalesforceSession implements Service {
private final ObjectMapper objectMapper;
private final Set<SalesforceSessionListener> listeners;
- private String accessToken;
- private String instanceUrl;
+ private volatile String accessToken;
+ private volatile String instanceUrl;
public SalesforceSession(HttpClient httpClient, SalesforceLoginConfig config) {
// validate parameters
@@ -198,7 +198,7 @@ public class SalesforceSession implements Service {
return accessToken;
}
- public void logout() throws SalesforceException {
+ public synchronized void logout() throws SalesforceException {
if (accessToken == null) {
return;
}
@@ -236,7 +236,7 @@ public class SalesforceSession implements Service {
throw new SalesforceException("Logout request TIMEOUT!", null);
default:
- throw new SalesforceException("Unknow status: " + done, null);
+ throw new SalesforceException("Unknown status: " + done, null);
}
} catch (SalesforceException e) {
throw e;
@@ -247,7 +247,7 @@ public class SalesforceSession implements Service {
// reset session
accessToken = null;
instanceUrl = null;
- // notify all session listeners of the new access token and instance url
+ // notify all session listeners about logout
for (SalesforceSessionListener listener : listeners) {
try {
listener.onLogout();