Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Mon Oct 27 16:15:57 CET 2014
+#Wed Dec 03 20:03:01 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

src/de/tudarmstadt/informatik/hostage/sync/p2p/P2PSyncActivity.java

@@ -406,6 +406,8 @@ public class P2PSyncActivity extends Activity implements WifiP2pManager.GroupInf
 
                 oos.writeObject(thisSyncInfo);
                 oos.flush();
+                oos.reset();
+
                 publishProgress(3);
 
                 // --- 2. read sync data
@@ -424,6 +426,8 @@ public class P2PSyncActivity extends Activity implements WifiP2pManager.GroupInf
 
                 oos.writeObject(mySyncData);
                 oos.flush();
+                oos.reset();
+
                 publishProgress(5);
 
                 // --- 4. We are done!
@@ -506,6 +510,7 @@ public class P2PSyncActivity extends Activity implements WifiP2pManager.GroupInf
 
                 oos.writeObject(thisSyncInfo);
                 oos.flush();
+                oos.reset();
 
                 publishProgress(2);
 
@@ -525,6 +530,10 @@ public class P2PSyncActivity extends Activity implements WifiP2pManager.GroupInf
                 //thisSyncData.records.add(new Record());
                 oos.writeObject(thisSyncData);
                 oos.flush();
+                oos.reset();
+
+
+
                 publishProgress(4);
 
                 // --- 3. Receive sync data