[jboss-svn-commits] JBoss Common SVN: r4275 - arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2010-04-20 11:41:22 -0400 (Tue, 20 Apr 2010)
New Revision: 4275

Modified:
   arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
Log:
ARQ-102 fixed ShrinkWrap upgrade code


Modified: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java	2010-04-20 15:35:32 UTC (rev 4274)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java	2010-04-20 15:41:22 UTC (rev 4275)
@@ -30,6 +30,7 @@
 
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.Asset;
 import org.jboss.shrinkwrap.api.Filters;
 import org.jboss.shrinkwrap.api.Node;
 import org.jboss.shrinkwrap.impl.base.AssignableBase;
@@ -107,11 +108,11 @@
       Map<ArchivePath, Node> classes = archive.getContent(Filters.include(".*\\.class"));
       for(Map.Entry<ArchivePath, Node> classEntry : classes.entrySet()) 
       {
-         if (classEntry.getValue() instanceof ClassAsset)
+         if (classEntry.getValue().getAsset() instanceof ClassAsset)
          {
             beanClasses.add(
                   (Class<?>)extractFieldFromAsset(
-                        classEntry.getValue(),
+                        classEntry.getValue().getAsset(),
                         "clazz"));
          }
       }
@@ -142,14 +143,14 @@
       return serviceRegistry;
    }
    
-   private Object extractFieldFromAsset(Node node, String fieldName) 
+   private Object extractFieldFromAsset(Asset asset, String fieldName) 
    {
       try 
       {
-         Field field = node.getClass().getDeclaredField(fieldName);
+         Field field = asset.getClass().getDeclaredField(fieldName);
          field.setAccessible(true);
          
-         return field.get(node);
+         return field.get(asset);
       } 
       catch (Exception e) 
       {