lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject [1/2] lucene-solr git commit: fix compilation errors
Date Mon, 08 Feb 2016 19:11:32 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/jira/lucene-5438-nrt-replication 9afa56005 -> 30613c740


fix compilation errors


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c14fa123
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c14fa123
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c14fa123

Branch: refs/heads/jira/lucene-5438-nrt-replication
Commit: c14fa123da435a34c4f40e6685c3184ecd9a60e0
Parents: f0f4278
Author: Michael McCandless <mail@mikemccandless.com>
Authored: Mon Feb 8 14:07:14 2016 -0500
Committer: Mike McCandless <mikemccand@apache.org>
Committed: Mon Feb 8 14:07:14 2016 -0500

----------------------------------------------------------------------
 .../test/org/apache/lucene/replicator/nrt/Jobs.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c14fa123/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java
index a0b9535..de8c0c3 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java
@@ -80,7 +80,12 @@ class Jobs extends Thread implements Closeable {
         } else {
           node.message("AlreadyClosedException during job.visit job=" + topJob + "; now cancel");
         }
-        topJob.cancel("unexpected exception in visit", t);
+        try {
+          topJob.cancel("unexpected exception in visit", t);
+        } catch (Throwable t2) {
+          node.message("ignore exception calling cancel: " + t2);
+          t2.printStackTrace(System.out);
+        }
         try {
           topJob.onceDone.run(topJob);
         } catch (Throwable t2) {
@@ -112,7 +117,11 @@ class Jobs extends Thread implements Closeable {
       while (queue.isEmpty() == false) {
         SimpleCopyJob job = (SimpleCopyJob) queue.poll();
         node.message("top: Jobs: now cancel job=" + job);
-        job.cancel("jobs closing", null);
+        try {
+          job.cancel("jobs closing", null);
+        } catch (Throwable t) {
+          node.message("ignore exception calling cancel: " + t);
+        }
         try {
           job.onceDone.run(job);
         } catch (Throwable t) {


Mime
View raw message