2007-04-25 Kyle Galloway <kgallowa@redhat.com>

	* gnu/classpath/jdwp/VMIdManager.java (getObjectId): Deal with null
	objects.
	(get): Deal with ObjectId of 0. 



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124164 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 9 insertions, 1 deletions

diff --git a/libjava/gnu/classpath/jdwp/VMIdManager.java b/libjava/gnu/classpath/jdwp/VMIdManager.java
index 8d423e9b0d6..f787a8cdc7f 100644
--- a/libjava/gnu/classpath/jdwp/VMIdManager.java
+++ b/libjava/gnu/classpath/jdwp/VMIdManager.java
@@ -1,7 +1,7 @@
 /* VMIdManager.java -- A reference/example implementation of a manager for
    JDWP object/reference type IDs
 
-   Copyright (C) 2005, 2006 Free Software Foundation
+   Copyright (C) 2005, 2006, 2007 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -337,6 +337,10 @@ public class VMIdManager
    */
   public ObjectId getObjectId (Object theObject)
   {
+    // Special case: null object.
+    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 object id.
+    if (id == 0)
+      return new NullObjectId ();
+    
     ObjectId oid = (ObjectId) _idTable.get (new Long (id));
     if (oid == null)
       throw new InvalidObjectException (id);