svn commit: r1385012 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java

[ma...@apache.org]

Author: markrmiller
Date: Sat Sep 15 04:51:18 2012
New Revision: 1385012

URL: http://svn.apache.org/viewvc?rev=1385012&view=rev
Log:
if a task is rejected, decrement semaphore

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java?rev=1385012&r1=1385011&r2=1385012&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java Sat Sep 15 04:51:18 2012
@@ -29,6 +29,7 @@ import java.util.concurrent.CompletionSe
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
 
 import org.apache.http.client.HttpClient;
@@ -353,7 +354,12 @@ public class SolrCmdDistributor {
       Thread.currentThread().interrupt();
       throw new SolrException(ErrorCode.SERVICE_UNAVAILABLE, "Update thread interrupted", e);
     }
-    pending.add(completionService.submit(task));
+    try {
+      pending.add(completionService.submit(task));
+    } catch (RejectedExecutionException e) {
+      semaphore.release();
+      throw e;
+    }
     
   }