Fix image reading

- Ensure all objects are filled in - Empty pointer slots should be nil, not null
hpi-swa · Dec 27, 2017 · ac530ac · ac530ac
1 parent a7e438f
commit ac530ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...lesqueak/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/util/SqueakImageChunk.java b/...lesqueak/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/util/SqueakImageChunk.java
@@ -142,7 +142,7 @@ public Object asObject() {
             }
         }
         if (object == SqueakImageReader.NIL_OBJECT_PLACEHOLDER) {
-            return null;
+            return image.nil;
         } else {
             return object;
         }

diff --git a/...esqueak/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/util/SqueakImageReader.java b/...esqueak/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/util/SqueakImageReader.java
@@ -11,9 +11,9 @@
 import java.util.Vector;
 
 import de.hpi.swa.trufflesqueak.SqueakImageContext;
+import de.hpi.swa.trufflesqueak.model.BaseSqueakObject;
 import de.hpi.swa.trufflesqueak.model.ClassObject;
 import de.hpi.swa.trufflesqueak.model.NativeObject;
-import de.hpi.swa.trufflesqueak.model.SqueakObject;
 
 @SuppressWarnings("unused")
 public class SqueakImageReader {
@@ -288,8 +288,8 @@ private void initObjects(SqueakImageContext image) {
         output.println("Filling in objects...");
         for (SqueakImageChunk chunk : chunklist) {
             Object chunkObject = chunk.asObject();
-            if (chunkObject instanceof SqueakObject) {
-                ((SqueakObject) chunkObject).fillin(chunk);
+            if (chunkObject instanceof BaseSqueakObject) {
+                ((BaseSqueakObject) chunkObject).fillin(chunk);
             }
         }
     }