Author: rickhall
Date: Tue Jun 24 13:32:10 2008
New Revision: 671331
URL: http://svn.apache.org/viewvc?rev=671331&view=rev
Log:
Applied patch to fix a type error when creating dynamic wires.
(FELIX-606)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
URL:
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java?rev=671331&r1=671330&r2=671331&view=diff
==============================================================================
---
felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
(original)
+++
felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
Tue Jun 24 13:32:10 2008
@@ -701,14 +701,14 @@
if (candidate != null)
{
IWire[] wires = importer.getWires();
- R4Wire[] newWires = null;
+ IWire[] newWires = null;
if (wires == null)
{
- newWires = new R4Wire[1];
+ newWires = new IWire[1];
}
else
{
- newWires = new R4Wire[wires.length + 1];
+ newWires = new IWire[wires.length + 1];
System.arraycopy(wires, 0, newWires, 0,
wires.length);
}
@@ -3545,4 +3545,4 @@
return sb.toString();
}
-}
\ No newline at end of file
+}