geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r769854 - /geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java
Date Wed, 29 Apr 2009 17:53:43 GMT
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));



Mime
View raw message