summaryrefslogtreecommitdiffstats
path: root/libjava/classpath
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/classpath')
-rw-r--r--libjava/classpath/ChangeLog7
-rw-r--r--libjava/classpath/gnu/classpath/jdwp/value/StringValue.java9
-rw-r--r--libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.classbin934 -> 1104 bytes
3 files changed, 13 insertions, 3 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 669437a783a..9f136e094d2 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 2371547efed..1a7d0328d56 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 32526db8bdb..3298eb59b27 100644
--- a/libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.class
+++ b/libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.class
Binary files differ
OpenPOWER on IntegriCloud