karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject git commit: [KARAF-2840] Creating child container using admin service should use KARAF_OPTS
Date Fri, 21 Mar 2014 08:04:42 GMT
Repository: karaf
Updated Branches:
  refs/heads/master e8bea631e -> 808343e2b


[KARAF-2840] Creating child container using admin service should use KARAF_OPTS

Conflicts:
	instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java


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

Branch: refs/heads/master
Commit: 808343e2bde812cde439db96b97586b6ec98bc5e
Parents: e8bea63
Author: Guillaume Nodet <gnodet@gmail.com>
Authored: Fri Mar 21 08:56:27 2014 +0100
Committer: Guillaume Nodet <gnodet@gmail.com>
Committed: Fri Mar 21 09:04:27 2014 +0100

----------------------------------------------------------------------
 .../apache/karaf/instance/core/internal/InstanceServiceImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/808343e2/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
----------------------------------------------------------------------
diff --git a/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
index e3758d5..e5f3b48 100644
--- a/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
+++ b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
@@ -417,7 +417,9 @@ public class InstanceServiceImpl implements InstanceService {
                 if (opts == null || opts.length() == 0) {
                     opts = DEFAULT_JAVA_OPTS;
                 }
-                String karafOpts = System.getProperty("karaf.opts", "");
+
+                // fallback and read karafOpts from KARAF_OPTS environment if no System property
present
+                String karafOpts = System.getProperty("karaf.opts", System.getenv("KARAF_OPTS"));
 
                 File libDir = new File(System.getProperty("karaf.home"), "lib");
                 File[] jars = libDir.listFiles(new FilenameFilter() {


Mime
View raw message