Return-Path: 
 <commits-return-31918-apmail-camel-commits-archive=camel.apache.org@camel.apache.org>
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 75F68109E8
	for <apmail-camel-commits-archive@www.apache.org>;
 Thu, 28 Nov 2013 08:37:28 +0000 (UTC)
Received: (qmail 45303 invoked by uid 500); 28 Nov 2013 08:37:28 -0000
Delivered-To: apmail-camel-commits-archive@camel.apache.org
Received: (qmail 45154 invoked by uid 500); 28 Nov 2013 08:37:27 -0000
Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@camel.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@camel.apache.org>
List-Post: <mailto:commits@camel.apache.org>
List-Id: <commits.camel.apache.org>
Reply-To: dev@camel.apache.org
Delivered-To: mailing list commits@camel.apache.org
Received: (qmail 45139 invoked by uid 99); 28 Nov 2013 08:37:27 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Nov 2013 08:37:27 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 2900190F5AD; Thu, 28 Nov 2013 08:37:27 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: davsclaus@apache.org
To: commits@camel.apache.org
Date: Thu, 28 Nov 2013 08:37:28 -0000
Message-Id: <29d42b2f60264116b2a9e67a46a0c06b@git.apache.org>
In-Reply-To: <5179fa72a70e439cb61cb09aa5bd25d4@git.apache.org>
References: <5179fa72a70e439cb61cb09aa5bd25d4@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] git commit: CAMEL-7021: Allow clearing of field 'Name' for
 upserts in Salesforce component. Thanks to Dhiraj for the patch.

CAMEL-7021: Allow clearing of field 'Name' for upserts in Salesforce component. Thanks to Dhiraj for the patch.


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

Branch: refs/heads/camel-2.12.x
Commit: c2e801761b5787e5c3bac724065bd68559bc7cb5
Parents: 925b199
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Nov 28 09:39:10 2013 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Nov 28 09:39:26 2013 +0100

----------------------------------------------------------------------
 .../component/salesforce/api/dto/AbstractSObjectBase.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c2e80176/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
index 23cad48..fa20827 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
@@ -37,15 +37,15 @@ public class AbstractSObjectBase extends AbstractDTOBase {
     private String LastActivityDate;
 
     /**
-     * Utility method to clear all {@link AbstractSObjectBase} fields.
-     * <p>Used when reusing a DTO for a new record.</p>
+     * Utility method to clear all system {@link AbstractSObjectBase} fields.
+     * <p>Useful when reusing a DTO for a new record, or for update/upsert.</p>
+     * <p>This method does not clear {@code Name} to allow updating it, so it must be explicitly set to {@code null} if needed.</p>
      */
     public final void clearBaseFields() {
         attributes = null;
         Id = null;
         OwnerId = null;
         IsDeleted = null;
-        Name = null;
         CreatedDate = null;
         CreatedById = null;
         LastModifiedDate = null;