[jboss-cvs] JBossAS SVN: r96971 - in projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins: tracker and 1 other directory.

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

Author: alesj
Date: 2009-11-25 11:30:38 -0500 (Wed, 25 Nov 2009)
New Revision: 96971

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerContext.java
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/tracker/TrackerConstants.java
Log:
Change flag to noop, so we can perhaps use it by default.

Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerContext.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerContext.java	2009-11-25 16:28:51 UTC (rev 96970)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerContext.java	2009-11-25 16:30:38 UTC (rev 96971)
@@ -38,7 +38,7 @@
 import org.jboss.dependency.spi.ScopeInfo;
 import org.jboss.dependency.spi.tracker.ContextTracker;
 import org.jboss.dependency.spi.tracker.ContextTracking;
-import static org.jboss.dependency.plugins.tracker.TrackerConstants.FLAG;
+import static org.jboss.dependency.plugins.tracker.TrackerConstants.NOOP;
 import org.jboss.metadata.spi.MetaData;
 import org.jboss.metadata.spi.scope.CommonLevels;
 import org.jboss.metadata.spi.scope.CommonLevelsUtil;
@@ -365,19 +365,19 @@
 
    public ContextTracker getContextTracker()
    {
-      if (tracker == null || tracker == FLAG)
+      if (tracker == null || tracker == NOOP)
       {
          synchronized (this)
          {
             // since we got through, we must be the same caller
-            if (tracker == FLAG)
+            if (tracker == NOOP)
                return null;
 
             // we waited, got through, but it's now changed
-            if (tracker != null && tracker != FLAG)
+            if (tracker != null && tracker != NOOP)
                return tracker;
 
-            tracker = FLAG; // mark that we're initializing
+            tracker = NOOP; // mark that we're initializing
 
             ContextTracker ct = null;
             MetaData metaData = scopeInfo.getMetaData();

Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/tracker/TrackerConstants.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/tracker/TrackerConstants.java	2009-11-25 16:28:51 UTC (rev 96970)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/tracker/TrackerConstants.java	2009-11-25 16:30:38 UTC (rev 96971)
@@ -21,6 +21,7 @@
  */
 package org.jboss.dependency.plugins.tracker;
 
+import java.util.Collections;
 import java.util.Set;
 
 import org.jboss.dependency.spi.ControllerContext;
@@ -34,12 +35,12 @@
  */
 public abstract class TrackerConstants
 {
-   /** Dummy anchor tracker */
-   public static final ContextTracker FLAG = new ContextTracker()
+   /** Dummy noop anchor tracker */
+   public static final ContextTracker NOOP = new ContextTracker()
    {
       public int getUsedByCount(ControllerContext used, Object user)
       {
-         return -1;
+         return 0;
       }
 
       public void addUsedBy(ControllerContext used, Object user)
@@ -65,12 +66,12 @@
 
       public Set<Object> getUsers(ControllerContext used)
       {
-         return null;
+         return Collections.emptySet();
       }
 
       public <T extends ControllerContext> Set<T> getUsedContexts(Class<T> type)
       {
-         return null;
+         return Collections.emptySet();
       }
    };
 }