commit | 4bc8c5455ee6acba000ba30343cf07d1ddc0a8bd | [log] [tgz] |
---|---|---|
author | Guillaume Nodet <gnodet@apache.org> | Mon Jan 04 12:30:17 2010 +0000 |
committer | Guillaume Nodet <gnodet@apache.org> | Mon Jan 04 12:30:17 2010 +0000 |
tree | ce3fdf782a9bf34435d2531b7d7f79a931d51eb0 | |
parent | 6cb7ac2a51475f97fa1a0297605d9491321bb9ef [diff] |
FELIX-1964: unable to choose the framework using system properties git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@895615 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java index bd128d2..c983110 100644 --- a/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java +++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
@@ -175,11 +175,11 @@ BootstrapLogManager.setProperties(configProps); LOG.addHandler(BootstrapLogManager.getDefaultHandler()); - updateClassLoader(configProps); - // Copy framework properties from the system properties. Main.copySystemProperties(configProps); + updateClassLoader(configProps); + processSecurityProperties(configProps); if (configProps.getProperty(Constants.FRAMEWORK_STORAGE) == null) {