From 14d4217b595cf79d91c481b8492dfac980aaa054 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Wed, 20 Jun 2007 20:35:22 +0000 Subject: [PATCH] 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/ChangeLog | 5 +++++ libjava/classpath/ChangeLog | 7 +++++++ .../gnu/classpath/jdwp/value/StringValue.java | 9 ++++++--- .../gnu/classpath/jdwp/value/StringValue.class | Bin 934 -> 1104 bytes 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 87c2fc5b2e86..f609d268bb21 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2007-07-20 Keith Seitz + + * classpath/lib/gnu/classpath/jdwp/value/StringValue.class: + Regenerate. + 2007-07-20 Keith Seitz * gnu/classpath/jdwp/VMVirtualMachine.java (executeMethod): diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 669437a783ac..9f136e094d26 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,10 @@ +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 diff --git a/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java b/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java index 2371547efeda..1a7d0328d561 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 32526db8bdb145afdf02d3259419b28cb97f6fe8..3298eb59b27030521e073a98724fd0b5687a8fda 100644 GIT binary patch delta 414 zc-n=K%Syvg5QhJgfVFA7f>0L?wbnLitH*%5g5U+AkkF0T^~t5NA;e-*UHSs<@(ymq zML~+V@Bv);MB*56CzWA_VVLh5n1{m0qVoRv`Ub#+IaMCnofgCs?nWX>#v;Asp?5px z7k1CHMJxjUTE!M>3`*dqr~Xh(qLiVg8`gZPt3X3t#SR(_C1U$d=(}mpV>r;QP}~R} zi8$bW=lpx#{nIz{_%B929jyWk25tVPiZV8{id1jNS0g%C{l}agN;XTfd#PMJ!UB#_ z!b$cdoiQsj<&CT;H`#zX!x=z=On+N@L8bMKr5U#EPJ4#tl!g*ks4nLVE-5^$Vn_*8 Ye;|r=An)4ffSy9fcCkk!1J4cnUp{DNr2qf` delta 220 zc-p(bv5cMT)W2Q(7#J7~8Pqp&t!A`RO3y3RPtHj!E-pwc$K$_X4tl zONuh{(s>vZ8I%|qxXX(&OHv_1j12l3lP54qiTGqCmL=-vB<7{-Lu9Nq!zOnysZ74g z