diff options
| author | Keith Seitz <keiths@redhat.com> | 2007-06-20 20:35:22 +0000 |
|---|---|---|
| committer | Keith Seitz <kseitz@gcc.gnu.org> | 2007-06-20 20:35:22 +0000 |
| commit | 14d4217b595cf79d91c481b8492dfac980aaa054 (patch) | |
| tree | 504ac5ad3c9b9c3192a0983c1a863ec27ee3d3d8 | |
| parent | 67b2a930fd4739ff67969f8ee645c9d6b5512ed4 (diff) | |
| download | gcc-14d4217b595cf79d91c481b8492dfac980aaa054.zip gcc-14d4217b595cf79d91c481b8492dfac980aaa054.tar.gz gcc-14d4217b595cf79d91c481b8492dfac980aaa054.tar.bz2 | |
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
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/classpath/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/classpath/gnu/classpath/jdwp/value/StringValue.java | 9 | ||||
| -rw-r--r-- | libjava/classpath/lib/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 87c2fc5..f609d26 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2007-07-20 Keith Seitz <keiths@redhat.com> + * classpath/lib/gnu/classpath/jdwp/value/StringValue.class: + Regenerate. + +2007-07-20 Keith Seitz <keiths@redhat.com> + * gnu/classpath/jdwp/VMVirtualMachine.java (executeMethod): Update from reference implementation. * gnu/classpath/jdwp/natVMVirtualMachine.cc (executeMethod): 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 <keiths@redhat.com> + * 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 <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/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 Binary files differindex 32526db..3298eb5 100644 --- a/libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.class +++ b/libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.class |