bug fixed (only first era is routed).

SharedKnowledge · Dec 10, 2021 · 299ebb8 · 299ebb8
1 parent 8f88cef
commit 299ebb8
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/main/java/net/sharksystem/asap/engine/ASAPEngine.java b/src/main/java/net/sharksystem/asap/engine/ASAPEngine.java
@@ -583,16 +583,22 @@ public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 prot
         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;
+            Integer eraEncounteredMe = encounterMap.get(this.owner);
+            if(eraEncounteredMe != null) {
+                int eraEncounter = eraEncounteredMe;
+                Log.writeLog(this, this.toString(), "found me in encounter map: " + encounterMap);
+                // would start with next era
+                eraEncounter = ASAP.nextEra(eraEncounter);
+                if (eraEncounter != workingEra && ASAP.isEraInRange(eraEncounter, this.getOldestEra(), workingEra)) {
+                    // this seems to be a valid era - maybe got routed data
+                    Log.writeLog(this, this.toString(),
+                            "change 1st era from " + workingEra + " to " + eraEncounter);
+                    workingEra = eraEncounter;
+                }
             }
         }
-         */
 
         Log.writeLog(this, this.toString(), "transmit chunks from " + workingEra + " to era: " + this.era);