connections are no longer closed within asp3 but from caller

Author: thsc

src/net/sharksystem/asp3/ASP3ChunkSerialization.java

@@ -93,7 +93,7 @@ static void readChunks(String sender, ASP3ChunkStorage chunkStorage,
                 //<<<<<<<<<<<<<<<<<<debug
                 b = new StringBuilder();
                 b.append(logStart);
-                b.append("read chunkURI / #messages / sender");
+                b.append("read chunkURI / #messages / sender: ");
                 b.append(uri);
                 b.append(" / ");
                 b.append(number);

src/net/sharksystem/asp3/ASP3Engine.java

@@ -267,28 +267,29 @@ public void handleConnection(InputStream is, OutputStream os,
             System.out.println(b.toString());
             //>>>>>>>>>>>>>>>>>>>debug
         }
-        finally {
-            try {
-                // remember that we drop conversation with that peer
-                this.activePeers.remove(peer);
-                
-                //<<<<<<<<<<<<<<<<<<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
-            }
-        }
+        // connections are NOT close within that module but from caller!
+//        finally {
+//            try {
+//                // remember that we drop conversation with that peer
+//                this.activePeers.remove(peer);
+//                
+//                //<<<<<<<<<<<<<<<<<<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
+//            }
+//        }
     }
 
     @Override

test/BasicTests.java

@@ -100,9 +100,16 @@ public void androidUsage() throws IOException, ASP3Exception, InterruptedExcepti
         bobEngine.handleConnection(bobChannel.getInputStream(), 
                 bobChannel.getOutputStream(), bobListener);
 
-        // wait until communication end
+        // wait until communication probably ends
         Thread.sleep(10000);
 
+        // close connections: note ASP3Engine does NOT close any connection!!
+        aliceChannel.close();
+        bobChannel.close();
+        Thread.sleep(1000);
+        
+        // check results
+        
         // listener must have been informed about new messages
         Assert.assertTrue(aliceListener.chunkReceived());
         Assert.assertTrue(bobListener.chunkReceived());