hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject svn commit: r644895 - in /hadoop/core/branches/branch-0.16: CHANGES.txt src/java/org/apache/hadoop/ipc/Server.java
Date Fri, 04 Apr 2008 20:38:35 GMT
Author: nigel
Date: Fri Apr  4 13:38:34 2008
New Revision: 644895

URL: http://svn.apache.org/viewvc?rev=644895&view=rev
Log:
HADOOP-3010. Merge of -r 644422:644423 from trunk to branch 0.16.

Modified:
    hadoop/core/branches/branch-0.16/CHANGES.txt
    hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/ipc/Server.java

Modified: hadoop/core/branches/branch-0.16/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.16/CHANGES.txt?rev=644895&r1=644894&r2=644895&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.16/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.16/CHANGES.txt Fri Apr  4 13:38:34 2008
@@ -1,5 +1,10 @@
 Hadoop Change Log
 
+Release 0.16.3 - Unreleased
+
+    HADOOP-3010. Fix ConcurrentModificationException in ipc.Server.Responder.
+    (rangadi)
+
 Release 0.16.2 - 2008-04-02
 
   BUG FIXES

Modified: hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/ipc/Server.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/ipc/Server.java?rev=644895&r1=644894&r2=644895&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/ipc/Server.java (original)
+++ hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/ipc/Server.java Fri Apr  4
13:38:34 2008
@@ -470,13 +470,15 @@
           // long time, discard them.
           //
           LOG.debug("Checking for old call responses.");
-          iter = writeSelector.keys().iterator();
-          while (iter.hasNext()) {
-            SelectionKey key = iter.next();
-            try {
-              doPurge(key, now);
-            } catch (IOException e) {
-              LOG.warn("Error in purging old calls " + e);
+          synchronized (writeSelector.keys()) {
+            iter = writeSelector.keys().iterator();
+            while (iter.hasNext()) {
+              SelectionKey key = iter.next();
+              try {
+                doPurge(key, now);
+              } catch (IOException e) {
+                LOG.warn("Error in purging old calls " + e);
+              }
             }
           }
         } catch (OutOfMemoryError e) {



Mime
View raw message