[jboss-cvs] JBossAS SVN: r100411 - in projects/kernel/branches/resolver: jmx-mc-int/src/main/java/org/jboss/system/metadata and 1 other directories.

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

Author: kabir.khan at jboss.com
Date: 2010-02-04 08:23:10 -0500 (Thu, 04 Feb 2010)
New Revision: 100411

Modified:
   projects/kernel/branches/resolver/
   projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceInjectionValueMetaData.java
   projects/kernel/branches/resolver/kernel/pom.xml
Log:
Merged revisions 100371,100410 via svnmerge from 
https://svn.jboss.org/repos/jbossas/projects/kernel/trunk

.......
  r100371 | alesj | 2010-02-03 18:44:11 +0000 (Wed, 03 Feb 2010) | 1 line
  
  [JBKERNEL-88]; fix NPE in ServiceInjectionVMD.
.......
  r100410 | kabir.khan at jboss.com | 2010-02-04 13:17:32 +0000 (Thu, 04 Feb 2010) | 1 line
  
  Reenable qualifier tests
.......



Property changes on: projects/kernel/branches/resolver
___________________________________________________________________
Name: svnmerge-integrated
   - /projects/kernel/trunk:1-100335
   + /projects/kernel/trunk:1-100410

Modified: projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceInjectionValueMetaData.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceInjectionValueMetaData.java	2010-02-04 13:17:32 UTC (rev 100410)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceInjectionValueMetaData.java	2010-02-04 13:23:10 UTC (rev 100411)
@@ -66,6 +66,9 @@
    /** The required state of the dependency */
    private ControllerState dependentState = ControllerState.INSTALLED;
 
+   /** The underlying context */
+   private ServiceControllerContext underlyingContext;
+
    /**
     * Create a new ServiceInjectionValueMetaData.
     */
@@ -196,7 +199,7 @@
       }
       else
       {
-         return getTarget(null, context); // TODO - fix null
+         return getTarget(underlyingContext, context);
       }
    }
 
@@ -214,7 +217,7 @@
          ControllerContext context = controller.getContext(dependency, state);
          if (context != null)
          {
-            ungetTarget(null, context); // TODO - fix null
+            ungetTarget(underlyingContext, context);
             return null;
          }
       }
@@ -224,6 +227,7 @@
    public void visit(ServiceMetaDataVisitor visitor)
    {
       ServiceControllerContext context = visitor.getControllerContext();
+      underlyingContext = context; // remember context, leak?
       Object name = context.getName();
       ControllerState whenRequired = visitor.getContextState();
 

Modified: projects/kernel/branches/resolver/kernel/pom.xml
===================================================================
--- projects/kernel/branches/resolver/kernel/pom.xml	2010-02-04 13:17:32 UTC (rev 100410)
+++ projects/kernel/branches/resolver/kernel/pom.xml	2010-02-04 13:23:10 UTC (rev 100411)
@@ -32,7 +32,6 @@
           <excludes>
             <exclude>org/jboss/test/kernel/asynchronous/test/**</exclude>
             <exclude>org/jboss/test/kernel/qualifiers/test/**</exclude>
-            <exclude>org/jboss/test/kernel/deployment/xml/test/Qualifier*TestCase.*</exclude>
           </excludes>          
         </configuration>
       </plugin>