Fix NPE and bug in setLastError()

831ec18 did not fix the NPE
hpi-swa · Mar 11, 2021 · 6a294dd · 6a294dd
1 parent 7599fe2
commit 6a294dd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/PolyglotPlugin.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/PolyglotPlugin.java
@@ -1603,18 +1603,18 @@ protected static final long identityHashCode(@SuppressWarnings("unused") final O
     @GenerateNodeFactory
     @SqueakPrimitive(names = "primitiveGetLastError")
     protected abstract static class PrimGetLastErrorNode extends AbstractPrimitiveNode {
-        private static final Exception NO_EXCEPTION = new Exception("No exception");
-        private static Exception lastError = NO_EXCEPTION;
+        private static Exception lastError = new Exception("No exception");
 
         @Specialization
         @TruffleBoundary
         protected static final NativeObject doGetLastError(@SuppressWarnings("unused") final Object receiver,
                         @CachedContext(SqueakLanguage.class) final SqueakImageContext image) {
-            return image.asByteString(lastError.getMessage());
+            final String message = lastError.getMessage();
+            return image.asByteString(message != null ? message : lastError.toString());
         }
 
         protected static final void setLastError(final Exception e) {
-            lastError = e != null ? lastError : NO_EXCEPTION;
+            lastError = e;
             LogUtils.INTEROP.fine(() -> MiscUtils.toString(lastError));
         }
     }