svn commit: r1450116 - /felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java

[cl...@apache.org]

Author: clement
Date: Tue Feb 26 10:37:59 2013
New Revision: 1450116

URL: http://svn.apache.org/r1450116
Log:
Fix FELIX-3918

Modified:
    felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java

Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java?rev=1450116&r1=1450115&r2=1450116&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java Tue Feb 26 10:37:59 2013
@@ -442,6 +442,14 @@ public class DependencyHandler extends P
             boolean isProxy = true;
             // Detect proxy default value.
             String setting = getInstanceManager().getContext().getProperty(PROXY_SETTINGS_PROPERTY);
+
+            // Felix also includes system properties in the bundle context property, however it is not the case of the
+            // other frameworks, so if it's null we should call System.getProperty.
+
+            if (setting == null) {
+                setting = System.getProperty(PROXY_SETTINGS_PROPERTY);
+            }
+
             if (setting == null || PROXY_ENABLED.equals(setting)) { // If not set => Enabled
                 isProxy = true;
             } else if (setting != null  && PROXY_DISABLED.equals(setting)) {