[jboss-cvs] JBossAS SVN: r100084 - projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins.

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

Author: kabir.khan at jboss.com
Date: 2010-01-28 15:30:50 -0500 (Thu, 28 Jan 2010)
New Revision: 100084

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
Log:
[JBKERNEL-84] Avoid IllegalArgumentException in error message for DemandDependencyItem

Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2010-01-28 20:26:13 UTC (rev 100083)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2010-01-28 20:30:50 UTC (rev 100084)
@@ -1474,13 +1474,21 @@
                         {
                            try
                            {
-                              ControllerContext dependency = getContext(item.getIDependOn(), item.getDependentState());
-                              if (dependency != null)
+                              //FIXME DemandDependencyItems have a null iDependOn
+                              if (item.getIDependOn() == null)
                               {
-                                 DependencyInfo info = dependency.getDependencyInfo();
-                                 if (info != null)
+                                 log.warn("Null iDependOn for " + item);
+                              }
+                              else
+                              {
+                                 ControllerContext dependency = getContext(item.getIDependOn(), item.getDependentState());
+                                 if (dependency != null)
                                  {
-                                    info.removeDependsOnMe(item);
+                                    DependencyInfo info = dependency.getDependencyInfo();
+                                    if (info != null)
+                                    {
+                                       info.removeDependsOnMe(item);
+                                    }
                                  }
                               }
                            }