Author: gnodet
Date: Mon Jan 4 12:30:17 2010
New Revision: 895615
URL: http://svn.apache.org/viewvc?rev=895615&view=rev
Log:
FELIX-1964: unable to choose the framework using system properties
Modified:
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
Modified:
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java?rev=895615&r1=895614&r2=895615&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
(original)
+++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
Mon Jan 4 12:30:17 2010
@@ -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) {
