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

revert test change - it did not help 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1350357 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2012-06-14 18:20:13 +00:00
parent fb4e0a644b
commit 222fb0be9d
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,21 +161,10 @@ public final class SolrCore implements SolrInfoMBean {
public String getIndexDir() {
synchronized (searcherLock) {
RefCounted<SolrIndexSearcher> searcherRef = getNewestSearcher(false);
String indexDir;
try {
if (searcherRef == null) {
return dataDir + "index/";
}
SolrIndexSearcher searcher = searcherRef.get();
indexDir = searcher.getIndexDir() == null ? dataDir + "index/"
: searcher.getIndexDir();
} finally {
if (searcherRef != null) {
searcherRef.decref();
}
}
return indexDir;
if (_searcher == null)
return dataDir + "index/";
SolrIndexSearcher searcher = _searcher.get();
return searcher.getIndexDir() == null ? dataDir + "index/" : searcher.getIndexDir();
}
}