@@ -583,16 +583,22 @@ public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 prot
583
583
Map <String , Integer > encounterMap = asapInterest .getEncounterMap ();
584
584
Log .writeLog (this , this .toString (), "received encounterMap: " + encounterMap );
585
585
586
- /*
587
586
// am I in encounter list?
588
587
if (encounterMap != null ) {
589
- int eraEncounter = encounterMap.get(this.owner);
590
- if(ASAP.isEraInRange(eraEncounter, this.getOldestEra(), workingEra)) {
591
- // this seems to be a valid era - maybe got routed data
592
- workingEra = eraEncounter;
588
+ Integer eraEncounteredMe = encounterMap .get (this .owner );
589
+ if (eraEncounteredMe != null ) {
590
+ int eraEncounter = eraEncounteredMe ;
591
+ Log .writeLog (this , this .toString (), "found me in encounter map: " + encounterMap );
592
+ // would start with next era
593
+ eraEncounter = ASAP .nextEra (eraEncounter );
594
+ if (eraEncounter != workingEra && ASAP .isEraInRange (eraEncounter , this .getOldestEra (), workingEra )) {
595
+ // this seems to be a valid era - maybe got routed data
596
+ Log .writeLog (this , this .toString (),
597
+ "change 1st era from " + workingEra + " to " + eraEncounter );
598
+ workingEra = eraEncounter ;
599
+ }
593
600
}
594
601
}
595
- */
596
602
597
603
Log .writeLog (this , this .toString (), "transmit chunks from " + workingEra + " to era: " + this .era );
598
604
0 commit comments