You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/04/06 11:42:39 UTC
[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 <al...@gmail.com>
Authored: Tue Apr 5 17:59:03 2016 +0100
Committer: Aled Sage <al...@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);