commit 6a7c070cb8989af944e71e0b76e6b1f50dc27417
author Clement Escoffier <clement@apache.org> Tue Feb 26 10:37:59 2013 +0000
committer Clement Escoffier <clement@apache.org> Tue Feb 26 10:37:59 2013 +0000
tree e87fb899b2d9f8c8cd4f384838514a98384770f4
parent b8f7e882bff8ca578145b2b9f7642287675926e1

Fix FELIX-3918

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1450116 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
index a9e3eec..1e5a71c 100644
--- a/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
+++ b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
@@ -442,6 +442,14 @@
             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)) {