You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/12/01 19:24:31 UTC
[1/2] incubator-brooklyn git commit: Guards against blank string in
mysql.datadir
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 347402232 -> 862e2ebec
Guards against blank string in mysql.datadir
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bbf69131
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bbf69131
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bbf69131
Branch: refs/heads/master
Commit: bbf6913168ceace4af0074097f784f3a7ac162b5
Parents: 3474022
Author: Martin Harris <gi...@nakomis.com>
Authored: Tue Dec 1 14:32:36 2015 +0000
Committer: Martin Harris <gi...@nakomis.com>
Committed: Tue Dec 1 14:32:36 2015 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bbf69131/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
index 24b2d61..2d14726 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
@@ -100,7 +100,7 @@ public class MySqlSshDriver extends AbstractSoftwareProcessSshDriver implements
public String getDataDir() {
String result = entity.getConfig(MySqlNode.DATA_DIR);
- return (result == null) ? "." : result;
+ return Strings.isBlank(result) ? "." : result;
}
public String getLogFile() {
[2/2] incubator-brooklyn git commit: This closes #1079
Posted by sj...@apache.org.
This closes #1079
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/862e2ebe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/862e2ebe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/862e2ebe
Branch: refs/heads/master
Commit: 862e2ebec2ad273925f299771219c82f8f1b314a
Parents: 3474022 bbf6913
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Dec 1 18:24:06 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Tue Dec 1 18:24:06 2015 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------