2007-02-28 Kyle Galloway <kgallowa@redhat.com>

	* gnu/classpath/jdwp/id/NullObjectId.java: New class.
	* gnu/classpath/jdwp/util/NullObject.java: New class.
	* vm/reference/gnu/classpath/jdwp/VMIdManager.java
	(getObjectId): Handle null object.
	(get): Handle objectId of 0.

1 files changed, 8 insertions, 0 deletions

diff --git a/vm/reference/gnu/classpath/jdwp/VMIdManager.java b/vm/reference/gnu/classpath/jdwp/VMIdManager.java
index 8d423e9b0..9360e764d 100644
--- a/vm/reference/gnu/classpath/jdwp/VMIdManager.java
+++ b/vm/reference/gnu/classpath/jdwp/VMIdManager.java
@@ -337,6 +337,10 @@ public class VMIdManager
    */
   public ObjectId getObjectId (Object theObject)
   {
+    // Special case: null
+    if (theObject == null)
+      return new NullObjectId ();
+    
     ReferenceKey ref = new ReferenceKey (theObject, _refQueue);
     ObjectId id = (ObjectId) _oidTable.get (ref);
     if (id == null)
@@ -364,6 +368,10 @@ public class VMIdManager
   public ObjectId get (long id)
     throws InvalidObjectException
   {
+    // Special case: null
+    if (id == 0)
+      return new NullObjectId ();
+    
     ObjectId oid = (ObjectId) _idTable.get (new Long (id));
     if (oid == null)
       throw new InvalidObjectException (id);