You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/04/29 19:53:43 UTC
svn commit: r769854 -
/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java
Author: gawor
Date: Wed Apr 29 17:53:43 2009
New Revision: 769854
URL: http://svn.apache.org/viewvc?rev=769854&view=rev
Log:
synch with latest xbean-reflect changes
Modified:
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java?rev=769854&r1=769853&r2=769854&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java Wed Apr 29 17:53:43 2009
@@ -280,15 +280,15 @@
return new ReferenceRecipe(componentName);
} else if (v instanceof CollectionMetadata) {
CollectionMetadata collectionMetadata = (CollectionMetadata) v;
+ Class cl = collectionMetadata.getCollectionClass();
Class type = loadClass(collectionMetadata.getValueTypeName());
- if (collectionMetadata.getCollectionClass() == Object[].class) {
+ if (cl == Object[].class) {
ArrayRecipe ar = new ArrayRecipe();
for (Metadata lv : collectionMetadata.getValues()) {
ar.add(getValue(lv, type));
}
return ar;
} else {
- Class cl = collectionMetadata.getCollectionClass() == List.class ? ArrayList.class : HashSet.class;
CollectionRecipe cr = new CollectionRecipe(cl);
for (Metadata lv : collectionMetadata.getValues()) {
cr.add(getValue(lv, type));