Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-2793: Somtimes you must dec ref twice, and add fix to the other submit calls 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175651 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2011-09-26 03:28:55 +00:00
parent e927a69698
commit 4de85b89ff
1 changed files with 71 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
solr/core/src/java/org/apache/solr/core/SolrCore.java
View File

@ -1193,52 +1193,85 @@ public final class SolrCore implements SolrInfoMBean {
// warm the new searcher based on the current searcher.
// should this go before the other event handlers or after?
if (currSearcher != null) {
future = searcherExecutor.submit(
new Callable() {
public Object call() throws Exception {
try {
newSearcher.warm(currSearcher);
} catch (Throwable e) {
SolrException.logOnce(log,null,e);
try {
future = searcherExecutor.submit(
new Callable() {
public Object call() throws Exception {
try {
newSearcher.warm(currSearcher);
} catch (Throwable e) {
SolrException.logOnce(log,null,e);
}
return null;
}
return null;
}
}
);
);
} catch(Exception e) {
// if submit fails, newSearchHolder does not get decref'd
if (newSearchHolder != null) {
newSearchHolder.decref();
if (returnSearcher) {
newSearchHolder.decref();
}
}
throw e;
}
}
if (currSearcher==null && firstSearcherListeners.size() > 0) {
future = searcherExecutor.submit(
new Callable() {
public Object call() throws Exception {
try {
for (SolrEventListener listener : firstSearcherListeners) {
listener.newSearcher(newSearcher,null);
try {
future = searcherExecutor.submit(
new Callable() {
public Object call() throws Exception {
try {
for (SolrEventListener listener : firstSearcherListeners) {
listener.newSearcher(newSearcher,null);
}
} catch (Throwable e) {
SolrException.logOnce(log,null,e);
}
} catch (Throwable e) {
SolrException.logOnce(log,null,e);
return null;
}
return null;
}
}
);
);
} catch(Exception e) {
// if submit fails, newSearchHolder does not get decref'd
if (newSearchHolder != null) {
newSearchHolder.decref();
if (returnSearcher) {
newSearchHolder.decref();
}
}
throw e;
}
}
if (currSearcher!=null && newSearcherListeners.size() > 0) {
future = searcherExecutor.submit(
new Callable() {
public Object call() throws Exception {
try {
for (SolrEventListener listener : newSearcherListeners) {
listener.newSearcher(newSearcher, currSearcher);
try {
future = searcherExecutor.submit(
new Callable() {
public Object call() throws Exception {
try {
for (SolrEventListener listener : newSearcherListeners) {
listener.newSearcher(newSearcher, currSearcher);
}
} catch (Throwable e) {
SolrException.logOnce(log,null,e);
}
} catch (Throwable e) {
SolrException.logOnce(log,null,e);
return null;
}
return null;
}
}
);
);
} catch(Exception e) {
// if submit fails, newSearchHolder does not get decref'd
if (newSearchHolder != null) {
newSearchHolder.decref();
if (returnSearcher) {
newSearchHolder.decref();
}
}
throw e;
}
}
// WARNING: this code assumes a single threaded executor (that all tasks
@ -1268,7 +1301,12 @@ public final class SolrCore implements SolrInfoMBean {
);
} catch(Exception e) {
// if submit fails, newSearchHolder does not get decref'd
if (returnSearcher && newSearchHolder != null) newSearchHolder.decref();
if (newSearchHolder != null) {
newSearchHolder.decref();
if (returnSearcher) {
newSearchHolder.decref();
}
}
throw e;
}
}