You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2014/03/24 14:54:26 UTC
git commit: Fallback to empty string in case KARAF_OPTS is null
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x 171ad9c7e -> 8cbcbf02a
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/8cbcbf02
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8cbcbf02
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8cbcbf02
Branch: refs/heads/karaf-2.x
Commit: 8cbcbf02a41657120b87328f7d18b43e9996174e
Parents: 171ad9c
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Mon Mar 24 11:22:57 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Mon Mar 24 11:24:10 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/8cbcbf02/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 dfc3b96..5613ef5 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
@@ -395,7 +395,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");