Return-Path: X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2151610FC3 for ; Fri, 21 Mar 2014 07:59:28 +0000 (UTC) Received: (qmail 69090 invoked by uid 500); 21 Mar 2014 07:59:14 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 68734 invoked by uid 500); 21 Mar 2014 07:57:45 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 68669 invoked by uid 99); 21 Mar 2014 07:57:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Mar 2014 07:57:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A0BC1987984; Fri, 21 Mar 2014 07:57:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gnodet@apache.org To: commits@karaf.apache.org Date: Fri, 21 Mar 2014 07:57:27 -0000 Message-Id: In-Reply-To: <0d08e5b4762042d9a27c19cd3b34afb8@git.apache.org> References: <0d08e5b4762042d9a27c19cd3b34afb8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: [KARAF-2840] Creating child container using admin service should use KARAF_OPTS [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/e7812263 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e7812263 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e7812263 Branch: refs/heads/karaf-2.x Commit: e7812263af1fcb4d4ba41fc407b045e0970847a1 Parents: 6e27c86 Author: Guillaume Nodet Authored: Fri Mar 21 08:56:27 2014 +0100 Committer: Guillaume Nodet Committed: Fri Mar 21 08:57:18 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/e7812263/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 845f699..dfc3b96 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 @@ -393,7 +393,9 @@ public class AdminServiceImpl implements AdminService { 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")); String location = instance.loc; File libDir = new File(System.getProperty("karaf.home"), "lib");