Changeset 14600

Timestamp:

01/09/14 11:22:38 (10 years ago)

Author:

Mark Evenson

Message:

Signal Java-side exceptions caught in JavaObject?.printObject() as a Lisp error.

From ferada on #abcl: toString() should be caught, otherwise abcl
just stops ​http://paste.lisp.org/display/140719.

File:

• trunk/abcl/src/org/armedbear/lisp/JavaObject.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/JavaObject.java

@@ -360 +360 @@
             return obj.toString();
         final String s;
-        if(obj != null) {
+        if (obj != null) {
             Class<?> c = obj.getClass();
             StringBuilder sb
                 = new StringBuilder(c.isArray() ? "jarray" : c.getName());
             sb.append(' ');
-            String ts = obj.toString();
-            int length = -1;
-            LispObject stringLength = _JAVA_OBJECT_TO_STRING_LENGTH.symbolValueNoThrow();
-            if (stringLength instanceof Fixnum) {
-                length = Fixnum.getValue(stringLength);
-            }
-            if (length < 0) {
-                sb.append(ts);
-            }else if (ts.length() > length) { 
-                // use '....' to not confuse user with PPRINT conventions
-                sb.append(ts.substring(0, length)).append("...."); 
-            } else {
-                sb.append(ts);
-            }
-            s = sb.toString();
+      try {
+        String ts = obj.toString();
+        int length = -1;
+        LispObject stringLength = _JAVA_OBJECT_TO_STRING_LENGTH.symbolValueNoThrow();
+        if (stringLength instanceof Fixnum) {
+          length = Fixnum.getValue(stringLength);
+        }
+        if (length < 0) {
+          sb.append(ts);
+        } else if (ts.length() > length) { 
+          // use '....' to not confuse user with PPRINT conventions
+          sb.append(ts.substring(0, length)).append("...."); 
+        } else {
+          sb.append(ts);
+        }
+        s = sb.toString();
+      } catch (Exception e) {
+        return serror(new JavaException(e));
+      }
         } else {
             s = "null";