process counter now serialized too.

2 files changed, 6 insertions, 1 deletions

diff --git a/sources/core/VSProcess.java b/sources/core/VSProcess.java
index 9842321..03b03e5 100644
--- a/sources/core/VSProcess.java
+++ b/sources/core/VSProcess.java
@@ -216,14 +216,15 @@ public class VSProcess extends VSPrefs implements VSSerializable {
         /* May be not null if called from deserialization */
         if (this.protocolsToReset == null)
             this.protocolsToReset = new ArrayList<VSAbstractProtocol>();
+
         this.processNum = processNum;
         this.prefs = prefs;
         this.simulatorCanvas = simulatorCanvas;
         this.logging = logging;
 
-        tasks = new VSPriorityQueue<VSTask>();
         processID = simulatorCanvas.processIDCount();
         random = new VSRandom(processID*processNum+processID+processNum);
+        tasks = new VSPriorityQueue<VSTask>();
 
         initTimeFormats();
 
diff --git a/sources/simulator/VSSimulatorCanvas.java b/sources/simulator/VSSimulatorCanvas.java
index 92247c9..c28be85 100644
--- a/sources/simulator/VSSimulatorCanvas.java
+++ b/sources/simulator/VSSimulatorCanvas.java
@@ -1627,6 +1627,8 @@ public class VSSimulatorCanvas extends Canvas
         /** For later backwards compatibility, to add more stuff */
         objectOutputStream.writeObject(new Boolean(false));
 
+        objectOutputStream.writeObject(new Integer(processCounter));
+
         synchronized (processes) {
             objectOutputStream.writeObject(new Integer(numProcesses));
             for (VSProcess process : processes)
@@ -1653,6 +1655,8 @@ public class VSSimulatorCanvas extends Canvas
         /** For later backwards compatibility, to add more stuff */
         objectInputStream.readObject();
 
+        processCounter = ((Integer) objectInputStream.readObject()).intValue();
+
         int num = ((Integer) objectInputStream.readObject()).intValue();
         logging.clear();