bug fix - era change are not completely made persistent while running aasp.

Fully delivered chunks are no longer dropped per default.

Author: thsc42

src/net/sharksystem/aasp/AASPEngine.java

@@ -14,7 +14,6 @@
  * See ASPChunkStorage for details.
  * 
  * @see AASPStorage
- * @see AASPReader
  * @author thsc
  */
 public abstract class AASPEngine implements AASPStorage, AASPProtocolEngine {
@@ -37,6 +36,7 @@ public abstract class AASPEngine implements AASPStorage, AASPProtocolEngine {
     protected AASPMemento memento = null;
 
     /* private */ final private AASPChunkStorage chunkStorage;
+    private boolean dropDeliveredChunks = false;
 
     protected AASPEngine(AASPChunkStorage chunkStorage) 
             throws AASPException, IOException {
@@ -87,7 +87,7 @@ public void add(CharSequence urlTarget, CharSequence message) throws IOException
 
     private String getLogStart() {
         StringBuilder b = new StringBuilder();
-        b.append("ASP3Engine (");
+        b.append("AASPEngine (");
         b.append(this.owner);
         b.append(") ");
 
@@ -208,10 +208,10 @@ public void handleConnection(InputStream is, OutputStream os,
                     //>>>>>>>>>>>>>>>>>>>debug
 
                     // is not a public chunk
-                    if(!this.isPublic(chunk)) {
+                    if (!this.isPublic(chunk)) {
                         List<CharSequence> recipients = chunk.getRecipients();
 
-                        if(!recipients.contains(peer)) {
+                        if (!recipients.contains(peer)) {
                             continue;
                         }
                     }
@@ -234,13 +234,20 @@ public void handleConnection(InputStream is, OutputStream os,
                     System.out.println(b.toString());
                     //>>>>>>>>>>>>>>>>>>>debug
                     // empty?
-                    if(chunk.getRecipients().isEmpty()) {
-                        chunk.drop();
-                        //<<<<<<<<<<<<<<<<<<debug
-                        b = new StringBuilder();
-                        b.append(this.getLogStart());
-                        b.append("chunk dropped");
-                        System.out.println(b.toString());
+                    if (chunk.getRecipients().isEmpty()) {
+                        if (this.isDropDeliveredChunks()) {
+                            chunk.drop();
+                            //<<<<<<<<<<<<<<<<<<debug
+                            b = new StringBuilder();
+                            b.append(this.getLogStart());
+                            b.append("chunk dropped");
+                            System.out.println(b.toString());
+                        } else {
+                            b = new StringBuilder();
+                            b.append(this.getLogStart());
+                            b.append("drop flag set false - engine does not remove delivered chunks");
+                            System.out.println(b.toString());
+                        }
                     }
                 }
 
@@ -297,6 +304,14 @@ public void handleConnection(InputStream is, OutputStream os,
 //        }
     }
 
+    private boolean isDropDeliveredChunks() {
+        return this.dropDeliveredChunks;
+    }
+
+    public void setDropDeliveredChunks(boolean drop) {
+        this.dropDeliveredChunks = drop;
+    }
+
     static int nextEra(int workingEra) {
         if(workingEra == Integer.MAX_VALUE) {
             return 0;
@@ -375,7 +390,10 @@ private synchronized void incrementEra() throws IOException {
         this.era = this.getNextEra(this.era);
 
         // drop very very old chunks - if available
-        this.chunkStorage.dropChunks(this.era); 
+        this.chunkStorage.dropChunks(this.era);
+
+        // persistent values
+        if(this.memento != null) this.memento.save(this);
     }
 
     /**

src/net/sharksystem/aasp/AASPProtocolEngine.java

@@ -11,4 +11,15 @@
 interface AASPProtocolEngine {
     public void handleConnection(InputStream is, OutputStream os,
             AASPReceivedChunkListener listener) throws IOException;
+
+    /**
+     * Chunks are (tried to be) delivered to their recipients during each encounter
+     * with another peer. After successful delivery, recipient is withdrawn from recipient
+     * list to prevent mutliple delivery.
+     *
+     * If this flag is set, chunk are removed permanently if their are delivered
+     * to all their recipients. If no set, they remain intact.
+     * @param drop
+     */
+    void setDropDeliveredChunks(boolean drop);
 }

test/net/sharksystem/aasp/BasicTests.java

@@ -29,13 +29,13 @@ public void androidUsage() throws IOException, AASPException, InterruptedExcepti
 
         // alice writes a message into chunkStorage
         AASPStorage aliceStorage = 
-                AASPEngineFS.getAASPChunkStorage(ALICE_FOLDER);
+                AASPEngineFS.getAASPChunkStorage(ALICE, ALICE_FOLDER);
 
         aliceStorage.add(ALICE_BOB_CHAT_URL, ALICE2BOB_MESSAGE);
 
         // bob does the same
         AASPStorage bobStorage = 
-                AASPEngineFS.getAASPChunkStorage(BOB_FOLDER);
+                AASPEngineFS.getAASPChunkStorage(BOB, BOB_FOLDER);
 
         bobStorage.add(ALICE_BOB_CHAT_URL, BOB2ALICE_MESSAGE);
 
@@ -71,7 +71,7 @@ public void androidUsage() throws IOException, AASPException, InterruptedExcepti
                 bobChannel.getOutputStream(), bobListener);
 
         // wait until communication probably ends
-        Thread.sleep(10000);
+        Thread.sleep(5000);
 
         // close connections: note AASPEngine does NOT close any connection!!
         aliceChannel.close();
@@ -114,5 +114,10 @@ public void androidUsage() throws IOException, AASPException, InterruptedExcepti
         // expect bob
         Assert.assertEquals(1, senderList.size());
         Assert.assertTrue(BOB.equalsIgnoreCase(senderList.get(0).toString()));
+
+        // simulate a sync
+        bobStorage = AASPEngineFS.getAASPChunkStorage(BOB, BOB_FOLDER);
+        Assert.assertEquals(1, bobStorage.getEra());
+        Assert.assertEquals(bobEngine.getEra(), bobStorage.getEra());
     }
 }