[jboss-cvs] JBossAS SVN: r100371 - projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata.

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

Author: alesj
Date: 2010-02-03 13:44:11 -0500 (Wed, 03 Feb 2010)
New Revision: 100371

Modified:
   projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceInjectionValueMetaData.java
Log:
[JBKERNEL-88]; fix NPE in ServiceInjectionVMD.

Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceInjectionValueMetaData.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceInjectionValueMetaData.java	2010-02-03 18:34:39 UTC (rev 100370)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceInjectionValueMetaData.java	2010-02-03 18:44:11 UTC (rev 100371)
@@ -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();