karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject git commit: Fallback to empty string in case KARAF_OPTS is null
Date Wed, 23 Apr 2014 12:48:03 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-2.3.x fbbb223ba -> c56857d90


Fallback to empty string in case KARAF_OPTS is null


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

Branch: refs/heads/karaf-2.3.x
Commit: c56857d90280d68f9b2c48247d11e9a679e96de1
Parents: fbbb223
Author: Jonathan Anstey <janstey@gmail.com>
Authored: Mon Mar 24 11:22:57 2014 -0230
Committer: Jonathan Anstey <janstey@gmail.com>
Committed: Wed Apr 23 10:17:11 2014 -0230

----------------------------------------------------------------------
 .../java/org/apache/karaf/admin/internal/AdminServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/c56857d9/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
----------------------------------------------------------------------
diff --git a/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
b/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
index 93b928a..1fab91a 100644
--- a/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
+++ b/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
@@ -380,7 +380,8 @@ public class AdminServiceImpl implements AdminService {
                 }
 
                 // fallback and read karafOpts from KARAF_OPTS environment if no System property
present
-                String karafOpts = System.getProperty("karaf.opts", System.getenv("KARAF_OPTS"));
+                String karafOptsEnv = System.getenv("KARAF_OPTS");
+                String karafOpts = System.getProperty("karaf.opts", karafOptsEnv != null
? karafOptsEnv : "");
                 String location = instance.loc;
                 
                 File libDir = new File(System.getProperty("karaf.home"), "lib");


Mime
View raw message