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 07:56:50 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-2.3.x f07d312f9 -> b0abfaefb


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


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

Branch: refs/heads/karaf-2.3.x
Commit: b0abfaefb9256605234afa58d58e3e5ea8441927
Parents: f07d312
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 08:56:27 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/karaf/blob/b0abfaef/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 b01d6dd..93b928a 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
@@ -378,7 +378,9 @@ public class AdminServiceImpl implements AdminService {
                 if (opts == null || opts.length() == 0) {
                     opts = "-server -Xmx512M -Dcom.sun.management.jmxremote";
                 }
-                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"));
                 String location = instance.loc;
                 
                 File libDir = new File(System.getProperty("karaf.home"), "lib");


Mime
View raw message