river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r912546 - /incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceDiscoveryManager.java
Date Mon, 22 Feb 2010 12:25:56 GMT
Author: peter_firmstone
Date: Mon Feb 22 12:25:56 2010
New Revision: 912546

URL: http://svn.apache.org/viewvc?rev=912546&view=rev
Log:
[RIVER-324] Fix to fix from Bob Scheifler.

Modified:
    incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceDiscoveryManager.java

Modified: incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceDiscoveryManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceDiscoveryManager.java?rev=912546&r1=912545&r2=912546&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceDiscoveryManager.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceDiscoveryManager.java Mon Feb 22
12:25:56 2010
@@ -983,8 +983,16 @@
                         cacheTaskMgr.add(t);
                     }//end loop
                     /* 3. Handle events that came in prior to lookup */
+                    /* Fix provided by Bob Scheifler to JIRA [#RIVER-324] fix
+                     * to assign new task sequence numbers, to pending events
+                     * added to cacheTaskMgr.
+                     */ 
                     eReg.lookupsPending--;
-                    cacheTaskMgr.addAll(eReg.pending);
+		    for (iter = eReg.pending.iterator(); iter.hasNext(); ) {
+			NotifyEventTask t = (NotifyEventTask) iter.next();
+			t.thisTaskSeqN = taskSeqN++; // assign new seqN
+			cacheTaskMgr.add(t);
+                    }
                     eReg.pending.clear();
                 }//end sync(serviceIdMap)
                 logger.finest("ServiceDiscoveryManager - LookupTask "



Mime
View raw message