* classpath/gnu/classpath/jdwp/value/StringValue.java

        (StringValue): Tag of StringValue is STRING not OBJECT.
        (write): String values are written to the wire as tag byte
        and object ID, not JdwpString.

2 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c99ec0ee..78e8e7f7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-07-19  Keith Seitz  <keiths@redhat.com>
 
+	* classpath/gnu/classpath/jdwp/value/StringValue.java
+	(StringValue): Tag of StringValue is STRING not OBJECT.
+	(write): String values are written to the wire as tag byte
+	and object ID, not JdwpString.
+
+2007-07-19  Keith Seitz  <keiths@redhat.com>
+
 	* gnu/classpath/jdwp/processor/ClassTypeCommandSet.java
 	(executeInvokeMethod): No need to use ValueFactory any more;
 	MethodResult.getReturnedValue now returns a Value.
diff --git a/gnu/classpath/jdwp/value/StringValue.java b/gnu/classpath/jdwp/value/StringValue.java
index 2371547ef..1a7d0328d 100644
--- a/gnu/classpath/jdwp/value/StringValue.java
+++ b/gnu/classpath/jdwp/value/StringValue.java
@@ -38,7 +38,8 @@ exception statement from your version. */
 package gnu.classpath.jdwp.value;
 
 import gnu.classpath.jdwp.JdwpConstants;
-import gnu.classpath.jdwp.util.JdwpString;
+import gnu.classpath.jdwp.VMIdManager;
+import gnu.classpath.jdwp.id.ObjectId;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -61,7 +62,7 @@ public final class StringValue
    */
   public StringValue(String value)
   {
-    super(JdwpConstants.Tag.OBJECT);
+    super(JdwpConstants.Tag.STRING);
     _value = value;
   }
   
@@ -95,6 +96,8 @@ public final class StringValue
   protected void write(DataOutputStream os)
     throws IOException
   {
-    JdwpString.writeString(os, _value);
+    ObjectId oid = VMIdManager.getDefault().getObjectId (_value);
+    oid.write (os);
+
   }
 }