You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by go...@apache.org on 2012/10/17 17:05:36 UTC
svn commit: r1399296 -
/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
Author: gokturk
Date: Wed Oct 17 15:05:36 2012
New Revision: 1399296
URL: http://svn.apache.org/viewvc?rev=1399296&view=rev
Log:
* Further fix for FELIX-3576 (Injection class checking bug)
Modified:
felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java?rev=1399296&r1=1399295&r2=1399296&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java Wed Oct 17 15:05:36 2012
@@ -231,6 +231,7 @@ public class InstanceManager implements
for(int i=0; i < constructors.length; i++ )
{
String[] ctorArguments = constructors[i].getMethodArguments();
+
for(int index = 0; index < ctorArguments.length; index++ )
{
if(ctorArguments[index].equals(BundleContext.class.getName()))
@@ -250,7 +251,7 @@ public class InstanceManager implements
(ConstructorInjector)m_constructorRegistration.get(new Integer(siblingIndex));
Class injectorClass = siblingInjector.getConstructorParameterType(siblingIndex);
- if(injectorClass == null && ! injectorClass.getName().equals(injectionType))
+ if(injectorClass != null && ! injectorClass.getName().equals(injectionType))
{
injectionsConsistent = false;
break;