first running test for android usage.

Author: thsc42

src/net/sharksystem/asp3/ASP3ChunkSerialization.java

@@ -75,6 +75,13 @@ static void readChunks(String sender, ASP3ChunkStorage chunkStorage,
             ASP3Storage storage, DataInputStream dis, 
             ASP3ReceivedChunkListener listener) throws IOException {
 
+        StringBuilder b = new StringBuilder();
+        b.append("ASPChunkSerialization.readChunks (sender: ");
+        b.append(sender);
+        b.append(") ");
+        
+        String logStart = b.toString();
+        
         try {
             while(true) { // until IOException informs end of communication
                 // read URI
@@ -84,8 +91,8 @@ static void readChunks(String sender, ASP3ChunkStorage chunkStorage,
                 int number = dis.readInt();
 
                 //<<<<<<<<<<<<<<<<<<debug
-                StringBuilder b = new StringBuilder();
-                b.append("ASPChunkDeserialization: ");
+                b = new StringBuilder();
+                b.append(logStart);
                 b.append("read chunkURI / #messages / sender");
                 b.append(uri);
                 b.append(" / ");
@@ -100,15 +107,15 @@ static void readChunks(String sender, ASP3ChunkStorage chunkStorage,
                 if(chunk != null) {
                     //<<<<<<<<<<<<<<<<<<debug
                     b = new StringBuilder();
-                    b.append("ASPChunkDeserialization: ");
+                    b.append(logStart);
                     b.append("got chunk: ");
                     b.append(uri);
                     System.out.println(b.toString());
                     //>>>>>>>>>>>>>>>>>>>debug
                 } else {
                     //<<<<<<<<<<<<<<<<<<debug
                     b = new StringBuilder();
-                    b.append("ASPChunkDeserialization: ");
+                    b.append(logStart);
                     b.append("ERROR: no chunk found for sender/uri: ");
                     b.append(" / ");
                     b.append(uri);
@@ -122,7 +129,7 @@ static void readChunks(String sender, ASP3ChunkStorage chunkStorage,
                     String message = dis.readUTF();
                     //<<<<<<<<<<<<<<<<<<debug
                     b = new StringBuilder();
-                    b.append("ASPChunkDeserialization: ");
+                    b.append(logStart);
                     b.append("read message: ");
                     b.append(message);
                     System.out.println(b.toString());
@@ -139,8 +146,8 @@ static void readChunks(String sender, ASP3ChunkStorage chunkStorage,
             // done - connection closed
 
             //<<<<<<<<<<<<<<<<<<debug
-            StringBuilder b = new StringBuilder();
-            b.append("ASPChunkDeserialization: ");
+            b = new StringBuilder();
+            b.append(logStart);
             b.append("connection close - done");
             System.out.println(b.toString());
             //>>>>>>>>>>>>>>>>>>>debug

src/net/sharksystem/asp3/ASP3Engine.java

@@ -7,7 +7,6 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -23,6 +22,13 @@ public abstract class ASP3Engine implements ASP3ChunkStorage, ASP3ProtocolEngine
     static String DEFAULT_OWNER = ANONYMOUS_OWNER;
     static int DEFAULT_INIT_ERA = 0;
 
+    /**
+     * that engine transmitts serialized chunks to another peer.
+     * After transmission that channel is closed. In immediate closure would
+     * result in an IOException on the other side
+     */
+    private int sleepBeforeConnectionClosed = 5000; 
+    
     protected String owner = ANONYMOUS_OWNER;
 
     protected int era = 0;
@@ -251,20 +257,33 @@ public void handleConnection(InputStream is, OutputStream os,
             b.append("ended iterating chunks");
             System.out.println(b.toString());
             //>>>>>>>>>>>>>>>>>>>debug
-
-            // TODO IMPORTANT!!!
-            // sync incomming messagea as long as connected
         }
         catch(IOException ioe) {
-            // TODO
-            System.err.println("ioe: " + ioe.getLocalizedMessage());
+            //<<<<<<<<<<<<<<<<<<debug
+            StringBuilder b = new StringBuilder();
+            b.append(this.getLogStart());
+            b.append("IOEXception: ");
+            b.append(ioe.getLocalizedMessage());
+            System.out.println(b.toString());
+            //>>>>>>>>>>>>>>>>>>>debug
         }
         finally {
             try {
                 // remember that we drop conversation with that peer
                 this.activePeers.remove(peer);
 
-                dis.close();
+                //<<<<<<<<<<<<<<<<<<debug
+                StringBuilder b = new StringBuilder();
+                b.append(this.getLogStart());
+                b.append("about closing output stream");
+                System.out.println(b.toString());
+                //>>>>>>>>>>>>>>>>>>>debug
+                try {
+                    Thread.sleep(sleepBeforeConnectionClosed);
+                } catch (InterruptedException ex) {
+                    // ignore
+                }
+                //dis.close();
                 dos.close();
             } catch (IOException ex) {
                 // ignore

test/ASP3ChunkReceiverTester.java

@@ -12,7 +12,7 @@ public class ASP3ChunkReceiverTester implements ASP3ReceivedChunkListener {
 
     @Override
     public void chunkReceived(String sender, String uri, int era) {
-        System.out.println("ChunkReceiverTester.chunkReceived called" + 
+        System.out.println("ChunkReceiverTester.chunkReceived called: (sender/uri/era) " + 
                 sender +
                 " / " + 
                 uri +