VMIdManager.java (getObjectId): Deal with null objects.
2007-04-25 Kyle Galloway <kgallowa@redhat.com> * gnu/classpath/jdwp/VMIdManager.java (getObjectId): Deal with null objects. (get): Deal with ObjectId of 0. From-SVN: r124164
This commit is contained in:
committed by
Kyle Galloway
parent
aa86a51b89
commit
9f8b807381
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user