From 14d4217b595cf79d91c481b8492dfac980aaa054 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Wed, 20 Jun 2007 20:35:22 +0000 Subject: Update from classpath trunk: * classpath/lib/gnu/classpath/jdwp/value/StringValue.class: Regenerate. * 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. From-SVN: r125897 --- libjava/classpath/ChangeLog | 7 +++++++ .../gnu/classpath/jdwp/value/StringValue.java | 9 ++++++--- .../lib/gnu/classpath/jdwp/value/StringValue.class | Bin 934 -> 1104 bytes 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'libjava/classpath') diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 669437a..9f136e0 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,5 +1,12 @@ 2007-07-20 Keith Seitz + * 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-20 Keith Seitz + * gnu/classpath/jdwp/processor/ClassTypeCommandSet.java (executeInvokeMethod): No need to use ValueFactory any more; MethodResult.getReturnedValue now returns a Value. diff --git a/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java b/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java index 2371547..1a7d032 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java +++ b/libjava/classpath/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); + } } diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.class b/libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.class index 32526db..3298eb5 100644 Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.class and b/libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.class differ -- cgit v1.1