Return-Path: 
 <commits-return-13537-apmail-brooklyn-commits-archive=brooklyn.apache.org@brooklyn.apache.org>
X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org
Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3A77519010
	for <apmail-brooklyn-commits-archive@minotaur.apache.org>;
 Wed,  6 Apr 2016 09:42:39 +0000 (UTC)
Received: (qmail 21377 invoked by uid 500); 6 Apr 2016 09:42:39 -0000
Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org
Received: (qmail 21313 invoked by uid 500); 6 Apr 2016 09:42:39 -0000
Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@brooklyn.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@brooklyn.apache.org>
List-Post: <mailto:commits@brooklyn.apache.org>
List-Id: <commits.brooklyn.apache.org>
Reply-To: dev@brooklyn.apache.org
Delivered-To: mailing list commits@brooklyn.apache.org
Received: (qmail 21263 invoked by uid 99); 6 Apr 2016 09:42:39 -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; Wed, 06 Apr 2016 09:42:39 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id ABB8EDFFAE; Wed,  6 Apr 2016 09:42:38 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: svet@apache.org
To: commits@brooklyn.apache.org
Date: Wed, 06 Apr 2016 09:42:39 -0000
Message-Id: <cd65138023ef48f78b54a5a4025fe4b4@git.apache.org>
In-Reply-To: <321d40345bee41dbbe26172be79e5e75@git.apache.org>
References: <321d40345bee41dbbe26172be79e5e75@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/6] brooklyn-server git commit: Trim publicKeyData

Trim publicKeyData

Otherwise get incorrect warning about the publicKey not matching
the privateKey.

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

Branch: refs/heads/master
Commit: ee3159bf4e94a1ef9a32c8c5c46a790be2c56146
Parents: 99dd3ba
Author: Aled Sage <aled.sage@gmail.com>
Authored: Tue Apr 5 17:59:03 2016 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Tue Apr 5 17:59:03 2016 +0100

----------------------------------------------------------------------
 .../org/apache/brooklyn/core/location/LocationConfigUtils.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ee3159bf/core/src/main/java/org/apache/brooklyn/core/location/LocationConfigUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/LocationConfigUtils.java b/core/src/main/java/org/apache/brooklyn/core/location/LocationConfigUtils.java
index 40ecd72..bc2eb49 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/LocationConfigUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/LocationConfigUtils.java
@@ -405,8 +405,8 @@ public class LocationConfigUtils {
     private static String getKeyDataFromDataKeyOrFileKey(ConfigBag config, ConfigKey<String> dataKey, ConfigKey<String> fileKey) {
         boolean unused = config.isUnused(dataKey);
         String data = config.get(dataKey);
-        if (groovyTruth(data) && !unused) {
-            return data;
+        if (Strings.isNonBlank(data) && !unused) {
+            return data.trim();
         }
         
         String file = config.get(fileKey);