bug fixed (only first era is routed).

Author: thsc42

src/main/java/net/sharksystem/asap/engine/ASAPEngine.java

@@ -105,17 +105,22 @@ private boolean isPublic(ASAPInternalChunk chunk) {
 
     @Override
     public void newEra() {
+        this.newEra(false, -1);
+    }
+
+    private void newEra(boolean force, int nextEra) {
         try {
             this.syncMemento();
         } catch (IOException e) {
             Log.writeLogErr(this, this.toString(),"cannot read memento: " + e.getLocalizedMessage());
         }
 
-        if(this.contentChanged) {
-            Log.writeLog(this, this.toString(), "content changed - increment era...");
+        if(force || this.contentChanged) {
+            if(this.contentChanged) Log.writeLog(this, this.toString(), "content changed - increment era...");
+            if(force) Log.writeLog(this, this.toString(), "increment era to add new chunks");
             try {
                 int oldEra = this.era;
-                int nextEra = this.getNextEra(this.era);
+                nextEra = nextEra < 0 ? this.getNextEra(this.era) : nextEra;
 
                 // set as fast as possible to make race conditions less likely
                 this.contentChanged = false;
@@ -268,6 +273,15 @@ public ASAPChunkStorage getChunkStorage() {
         return this.chunkStorage;
     }
 
+
+    @Override
+    public ASAPInternalChunk createNewChunk(String uri, int newEra) throws IOException {
+        ASAPInternalChunk chunk = this.getChunkStorage().getChunk(uri, newEra);
+        // set new era
+        this.newEra(true, newEra);
+        return chunk;
+    }
+
     ASAPChunkStorage getStorage() {
         return this.chunkStorage;
     }
@@ -394,7 +408,7 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimilationPDU, A
         //>>>>>>>>>>>>>>>>>>>debug
 
         // get received storage
-        ASAPStorage incomingStorage = this.getIncomingStorage(senderE2E, true);
+        ASAPInternalStorage incomingStorage = (ASAPInternalStorage) this.getIncomingStorage(senderE2E, true);
         ASAPChunkStorage incomingChunkStorage = incomingStorage.getChunkStorage();
         //ASAPChunkStorage incomingChunkStorage = this.getReceivedChunksStorage(senderE2E);
         Log.writeLog(this, this.toString(), "got incoming chunk storage for senderE2E: " + senderE2E);
@@ -436,7 +450,8 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimilationPDU, A
                 return;
             }
 
-            ASAPInternalChunk incomingChunk = incomingChunkStorage.getChunk(uri, eraSender);
+            ASAPInternalChunk incomingChunk = incomingStorage.createNewChunk(uri, eraSender);
+            //ASAPInternalChunk incomingChunk = incomingChunkStorage.getChunk(uri, eraSender);
 
             if(localChunk != null) {
                 Log.writeLog(this, this.toString(), "copy local meta data into newly created incoming chunk");
@@ -555,15 +570,31 @@ public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 prot
         Log.writeLog(this, this.toString(), b.toString());
         //>>>>>>>>>>>>>>>>>>>debug
 
-        Integer lastSeenEra = this.lastSeen.get(senderID);
+        // init
+        int workingEra = this.getOldestEra();
 
-        if(lastSeenEra == null) {
-            // still nothing
-            lastSeenEra = this.getOldestEra();
+        // already met?
+        if(this.lastSeen != null) {
+            Integer lastSeenEra = this.lastSeen.get(senderID);
+            if(lastSeenEra != null) workingEra = lastSeenEra;
         }
 
-        int workingEra = lastSeenEra;
-        Log.writeLog(this, this.toString(), "last_seen: " + workingEra + " | era: " + this.era);
+        // got even information from other side?
+        Map<String, Integer> encounterMap = asapInterest.getEncounterMap();
+        Log.writeLog(this, this.toString(), "received encounterMap: " + encounterMap);
+
+        /*
+        // am I in encounter list?
+        if(encounterMap != null) {
+            int eraEncounter = encounterMap.get(this.owner);
+            if(ASAP.isEraInRange(eraEncounter, this.getOldestEra(), workingEra)) {
+                // this seems to be a valid era - maybe got routed data
+                workingEra = eraEncounter;
+            }
+        }
+         */
+
+        Log.writeLog(this, this.toString(), "transmit chunks from " + workingEra + " to era: " + this.era);
 
         if(workingEra == this.era) {
             // nothing todo
@@ -591,9 +622,6 @@ public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 prot
         /////////////////////////////////// asap routing
 
         if(this.routingAllowed()) {
-            Map<String, Integer> encounterMap = asapInterest.getEncounterMap();
-            Log.writeLog(this, this.toString(), "routing allowed: encounterMap: " + encounterMap);
-
             // iterate: what sender do we know in our side?
             for(CharSequence receivedFromID : this.getSender()) {
                 if(PeerIDHelper.sameID(encounteredPeer, receivedFromID)) {

src/main/java/net/sharksystem/asap/engine/ASAPInternalStorage.java

@@ -164,9 +164,9 @@ public interface ASAPInternalStorage extends ASAPStorage {
     ASAPInternalStorage refresh() throws IOException, ASAPException;
 
     /**
-     * during assimilate - we create chunks based on era descriptions received from sender. We need a way to
-     * set this era in an incoming storage.
-     * @param newLastEra
+     * Get (and probably create a chunk - set era to this new era
+     * @param uri
+     * @param newEra
      */
-    void setOldestEra(int newLastEra) throws IOException;
+    ASAPInternalChunk createNewChunk(String uri, int newEra) throws IOException;
 }

src/test/java/junit5Tests/release_1/MultipleEncounterTests.java

@@ -199,7 +199,7 @@ public void multiEncounter_completelyDifferentURIs() throws InterruptedException
     }
 
     @Test
-    public void bugReport_multiHop() throws IOException, ASAPException, InterruptedException {
+    public void multipleEncounterRouting() throws IOException, ASAPException, InterruptedException {
         String alice2claraURI = "HelloToClara";
         String clara2aliceURI = "FromClara";
         int enounterCounter = 0;