felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1450115 - /felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
Date Tue, 26 Feb 2013 10:37:17 GMT
Author: clement
Date: Tue Feb 26 10:37:17 2013
New Revision: 1450115

URL: http://svn.apache.org/r1450115
Log:
Fix FELIX-3919

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

Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java?rev=1450115&r1=1450114&r2=1450115&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
(original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
Tue Feb 26 10:37:17 2013
@@ -419,6 +419,13 @@ public class Dependency extends Dependen
                 // Can we really proxy ? We can proxy only interfaces.
                 if (getSpecification().isInterface()) {
                     String type = getHandler().getInstanceManager().getContext().getProperty(DependencyHandler.PROXY_TYPE_PROPERTY);
+
+                    // If it's null we should check on the System directly, Felix delegates
to it,
+                    // but not other frameworks
+                    if (type == null) {
+                        type = System.getProperty(DependencyHandler.PROXY_TYPE_PROPERTY);
+                    }
+
                     if (type == null || type.equals(DependencyHandler.SMART_PROXY)) {
                         SmartProxyFactory proxyFactory = new SmartProxyFactory(this.getClass().getClassLoader());
                         m_proxyObject = proxyFactory.getProxy(getSpecification(), this);



Mime
View raw message