diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | gnu/classpath/jdwp/exception/JdwpInternalErrorException.java | 9 | ||||
-rw-r--r-- | gnu/classpath/jdwp/util/Value.java | 16 |
3 files changed, 28 insertions, 8 deletions
@@ -1,3 +1,14 @@ +2005-08-12 aluchko <aluchko@tomaluk.toronto.redhat.com> + + * gnu/classpath/jdwp/exception/JdwpInternalErrorException.java + (JdwpInternalErrorException): Added new constructor. + * gnu/classpath/jdwp/util/Value.java + (getUntaggedObj): + Changed InvalidFieldException to JdwpInternalErrorException. + (writeUntaggedValue): Likewise. + (writeTaggedValue): Likewise. + (writeValue): Likewise. + 2005-08-12 Aaron Luchko <aluchko@redhat.com> * gnu/classpath/jdwp/processor/EventRequestCommandSet.java: Implemented the diff --git a/gnu/classpath/jdwp/exception/JdwpInternalErrorException.java b/gnu/classpath/jdwp/exception/JdwpInternalErrorException.java index c022dc537..3cf8592f4 100644 --- a/gnu/classpath/jdwp/exception/JdwpInternalErrorException.java +++ b/gnu/classpath/jdwp/exception/JdwpInternalErrorException.java @@ -50,8 +50,13 @@ import gnu.classpath.jdwp.JdwpConstants; public class JdwpInternalErrorException extends JdwpException { - public JdwpInternalErrorException (Throwable cause) + public JdwpInternalErrorException(Throwable cause) { - super (JdwpConstants.Error.INTERNAL, cause); + super(JdwpConstants.Error.INTERNAL, cause); + } + + public JdwpInternalErrorException(String msg) + { + super(JdwpConstants.Error.INTERNAL, msg); } } diff --git a/gnu/classpath/jdwp/util/Value.java b/gnu/classpath/jdwp/util/Value.java index de7194dc7..a4bd9b946 100644 --- a/gnu/classpath/jdwp/util/Value.java +++ b/gnu/classpath/jdwp/util/Value.java @@ -43,6 +43,7 @@ import gnu.classpath.jdwp.JdwpConstants; import gnu.classpath.jdwp.exception.InvalidFieldException; import gnu.classpath.jdwp.exception.JdwpException; import gnu.classpath.jdwp.exception.JdwpInternalErrorException; +import gnu.classpath.jdwp.exception.NotImplementedException; import gnu.classpath.jdwp.id.ObjectId; import java.io.DataOutputStream; @@ -65,7 +66,7 @@ public class Value * @throws InvalidFieldException */ public static void writeUntaggedValue(DataOutputStream os, Object obj) - throws InvalidFieldException, IOException + throws JdwpException, IOException { writeValue(os, obj, false); } @@ -79,7 +80,7 @@ public class Value * @throws InvalidFieldException */ public static void writeTaggedValue(DataOutputStream os, Object obj) - throws InvalidFieldException, IOException + throws JdwpException, IOException { writeValue(os, obj, true); } @@ -96,7 +97,7 @@ public class Value */ private static void writeValue(DataOutputStream os, Object obj, boolean tagged) - throws IOException, InvalidFieldException + throws IOException, JdwpException { Class clazz = obj.getClass(); if (clazz.isPrimitive()) @@ -156,7 +157,8 @@ public class Value } else { // This shouldn't be possible - throw new InvalidFieldException("Field has invalid primitive!"); + throw new JdwpInternalErrorException( + "Field has invalid primitive!"); } } else @@ -235,7 +237,8 @@ public class Value return new byte[0]; else { // This shouldn't be possible - throw new InvalidFieldException("Field has invalid primitive!"); + throw new JdwpInternalErrorException( + "Field has invalid primitive!"); } } else @@ -291,7 +294,8 @@ public class Value ObjectId oid = Jdwp.getIdManager().readId(bb); return oid.getObject(); default: - throw new JdwpInternalErrorException("Could not find TAG:" + tag); + throw new NotImplementedException("Tag " + tag + + " is not implemented."); } } } |