brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [2/4] brooklyn-server git commit: Fix VanillaSoftwareProcessSshDriver.getInstallLabelExtraSalt
Date Tue, 24 May 2016 09:18:23 GMT
Fix VanillaSoftwareProcessSshDriver.getInstallLabelExtraSalt

Previously if download-url or install-command was blank, it would
not continue to look at shell-env for computing the salt for the 
install dir.

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

Branch: refs/heads/master
Commit: 13554d5cf433f1aeaab2be519e6698e2d85c5cdd
Parents: 8bfff16
Author: Aled Sage <aled.sage@gmail.com>
Authored: Fri May 20 18:06:29 2016 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Fri May 20 18:06:29 2016 +0100

----------------------------------------------------------------------
 .../entity/software/base/VanillaSoftwareProcessSshDriver.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/13554d5c/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessSshDriver.java
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessSshDriver.java
index f54e144..4e9bfdd 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessSshDriver.java
@@ -73,8 +73,9 @@ public class VanillaSoftwareProcessSshDriver extends AbstractSoftwareProcessSshD
         int hash = 0;
         for (ConfigKey<?> k: keys) {
             Maybe<?> value = ((ConfigurationSupportInternal)getEntity().config()).getNonBlocking(k);
-            if (value.isAbsent()) return null;
-            hash = hash*31 + (value.get()==null ? 0 : value.get().hashCode());
+            if (value.isPresent()) {
+                hash = hash*31 + (value.get()==null ? 0 : value.get().hashCode());
+            }
         }
         return hash;
     }


Mime
View raw message