Index: trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/EqualSOAPDataMap.java
===================================================================
--- trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/EqualSOAPDataMap.java	(revision 1985)
+++ trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/EqualSOAPDataMap.java	(revision 1986)
@@ -15,4 +15,8 @@
 package de.ugoe.cs.autoquest.plugin.http.eventcore;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
@@ -30,23 +34,87 @@
  * @author Steffen Herbold
  */
-public class EqualSOAPDataMap {
+public class EqualSOAPDataMap implements Serializable {
     
+    /**  */
+    private static final long serialVersionUID = 1L;
+
     /**
      * Singleton. Handle to only instance of this class
      */
-    public final static EqualSOAPDataMap INSTANCE = new EqualSOAPDataMap();
+    transient private static EqualSOAPDataMap INSTANCE = new EqualSOAPDataMap();
     
     /**
      * Map with all soapRequestBodies for all equal {@link SimpleSOAPEventType}s
      */
-    private final Map<SimpleSOAPEventType, ListOrderedSet<String>> soapRequestBodies = new HashMap<>();
+    private Map<SimpleSOAPEventType, ListOrderedSet<String>> soapRequestBodies = new HashMap<>();
     
     /**
      * random number generator for picking a random request body
      */
-    private final Random random = new Random(1); // TODO static seed for testing
+    transient private final Random random;
+    
+    /**
+     * <p>
+     * return the instance of the class
+     * </p>
+     *
+     * @return
+     */
+    public static EqualSOAPDataMap getInstance() {
+        return INSTANCE;
+    }
     
     private EqualSOAPDataMap() {
         // private constructor to avoid initialization
+        random = new Random();
+    }
+    
+    /**
+     * <p>
+     * Manual serialization of the object. Necessary to guarantee the singleton
+     * property.
+     * </p>
+     * 
+     * @param s
+     *            output stream for the serialization
+     * @throws IOException
+     *             thrown if there is problem writing to the output stream
+     */
+    private void writeObject(ObjectOutputStream s) throws IOException {
+            s.defaultWriteObject();
+            s.writeObject(soapRequestBodies);
+    }
+
+    /**
+     * <p>
+     * Manual de-serialization of the object. Necessary to guarantee the
+     * singleton property.
+     * 
+     * @param s
+     *            input stream for the de-serialization
+     * @throws IOException
+     *             thrown if there is problem reading from the input stream
+     * @throws ClassNotFoundException
+     *             thrown if there is a problem reading from the input stream
+     */
+    @SuppressWarnings("unchecked")
+    private void readObject(ObjectInputStream s) throws IOException,
+                    ClassNotFoundException {
+            s.defaultReadObject();
+            if (INSTANCE == null) {
+                INSTANCE = new EqualSOAPDataMap();
+            }
+            INSTANCE.soapRequestBodies = (Map<SimpleSOAPEventType, ListOrderedSet<String>>) s.readObject();
+    }
+
+    /**
+     * <p>
+     * Manual de-serialization to guarantee the singleton property.
+     * </p>
+     * 
+     * @return instance of the container
+     */
+    private Object readResolve() {
+            return INSTANCE;
     }
 
@@ -97,3 +165,13 @@
         return requestBodySet.get(random.nextInt(requestBodySet.size()));
     }
+    
+    /**
+     * <p>
+     * resets the internal map by creating new one
+     * </p>
+     *
+     */
+    public void reset() {
+        soapRequestBodies = new HashMap<>();
+    }
 }
Index: trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SimpleSOAPEventType.java
===================================================================
--- trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SimpleSOAPEventType.java	(revision 1985)
+++ trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SimpleSOAPEventType.java	(revision 1986)
@@ -99,5 +99,5 @@
         this.clientName = clientName;
         this.soapRequestBody = SOAPUtils.getSerialization(soapRequestBody);
-        EqualSOAPDataMap.INSTANCE.add(this, this.soapRequestBody);
+        EqualSOAPDataMap.getInstance().add(this, this.soapRequestBody);
     }
 
@@ -150,5 +150,5 @@
                 break;
             case RANDOM:
-                requestBody = EqualSOAPDataMap.INSTANCE.getRandom(this);
+                requestBody = EqualSOAPDataMap.getInstance().getRandom(this);
                 break;
             default:
@@ -157,5 +157,5 @@
         if( requestBody==null ) {
             System.err.println("foobar" + this);
-            System.err.println(EqualSOAPDataMap.INSTANCE.getAll(this));
+            System.err.println(EqualSOAPDataMap.getInstance().getAll(this));
         }
         try {