You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2017/04/10 23:08:04 UTC
lucene-solr:branch_6x: LUCENE-7775: fix exception handling to throw
first exception hit
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x f6d323976 -> 765d031c8
LUCENE-7775: fix exception handling to throw first exception hit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/765d031c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/765d031c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/765d031c
Branch: refs/heads/branch_6x
Commit: 765d031c86574878e35e4b13b93747255fbf8699
Parents: f6d3239
Author: Mike McCandless <mi...@apache.org>
Authored: Mon Apr 10 19:07:25 2017 -0400
Committer: Mike McCandless <mi...@apache.org>
Committed: Mon Apr 10 19:07:52 2017 -0400
----------------------------------------------------------------------
.../src/java/org/apache/lucene/index/BufferedUpdatesStream.java | 2 +-
lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/765d031c/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java b/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
index 9da1e09..e5aae4f 100644
--- a/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
+++ b/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
@@ -456,7 +456,7 @@ class BufferedUpdatesStream implements Accountable {
try {
segStates[j].finish(pool);
} catch (Throwable th) {
- if (firstExc != null) {
+ if (firstExc == null) {
firstExc = th;
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/765d031c/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java b/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java
index ce2050f..4838799 100644
--- a/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java
+++ b/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java
@@ -85,7 +85,7 @@ final class SegmentDocValues {
try {
dvp.decRef();
} catch (Throwable th) {
- if (t != null) {
+ if (t == null) {
t = th;
}
}