svn commit: r379653 - /beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/requeststate/NameService.java

[do...@apache.org]

Author: dolander
Date: Tue Feb 21 18:36:26 2006
New Revision: 379653

URL: http://svn.apache.org/viewcvs?rev=379653&view=rev
Log:
Lesson: Run Unit tests before Checkin actual saves time in the long run.
Fixed up the BVT break.


Modified:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/requeststate/NameService.java

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/requeststate/NameService.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/requeststate/NameService.java?rev=379653&r1=379652&r2=379653&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/requeststate/NameService.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/requeststate/NameService.java Tue Feb 21 18:36:26 2006
@@ -152,6 +152,8 @@
         if (object == null)
             throw new IllegalStateException("object must not be null");
 
+        reclaimSpace();
+
         String name = object.getObjectName();
         if (name == null)
             throw new IllegalStateException("object has not been named");
@@ -209,15 +211,16 @@
         if (name == null)
             throw new IllegalStateException("name must not be null");
 
-        WeakReference wr = (WeakReference) _nameMap.get(name);
+        TrackingObject to = (TrackingObject) _nameMap.get(name);
 
         // The object wasn't found
-        if (wr == null)
+        if (to == null)
             return null;
 
         // If the object has been reclaimed, then we remove the named object from the map.
-        TrackingObject to = (TrackingObject) wr.get();
-        if (to == null) {
+        WeakReference wr = to.getWeakINameable();
+        INameable o = (INameable) wr.get();
+        if (o == null) {
             _nameMap.remove(name);
             return null;
         }
@@ -225,6 +228,11 @@
             return to;
 
         return to.isMapCreated() ? to : null;
+    }
+
+    private void reclaimSpace()
+    {
+       System.err.println("\n*** Count:" + _nameMap.size());
     }
 
     /**