Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 934DC17251 for ; Fri, 20 Mar 2015 21:07:41 +0000 (UTC) Received: (qmail 71901 invoked by uid 500); 20 Mar 2015 21:07:41 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 71761 invoked by uid 500); 20 Mar 2015 21:07:41 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 71744 invoked by uid 99); 20 Mar 2015 21:07:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Mar 2015 21:07:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2BD41E10A8; Fri, 20 Mar 2015 21:07:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dhirajsb@apache.org To: commits@camel.apache.org Date: Fri, 20 Mar 2015 21:07:48 -0000 Message-Id: In-Reply-To: <3a30af40097f4c1fbfb06f0bffee7330@git.apache.org> References: <3a30af40097f4c1fbfb06f0bffee7330@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/9] camel git commit: CAMEL-8517: Updated SalesforceSession to use volatile shared fields 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/a1bf9207 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1bf9207 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1bf9207 Branch: refs/heads/camel-2.13.x Commit: a1bf92075b4977de80eb8c91f74fb6e565985810 Parents: 9c1c551 Author: Dhiraj Bokde Authored: Fri Mar 20 09:57:03 2015 -0700 Committer: Dhiraj Bokde Committed: Fri Mar 20 13:59:44 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/a1bf9207/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 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();