You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/06/14 20:20:14 UTC
svn commit: r1350357 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
Author: markrmiller
Date: Thu Jun 14 18:20:13 2012
New Revision: 1350357
URL: http://svn.apache.org/viewvc?rev=1350357&view=rev
Log:
revert test change - it did not help
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1350357&r1=1350356&r2=1350357&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java Thu Jun 14 18:20:13 2012
@@ -161,21 +161,10 @@ public final class SolrCore implements S
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();
}
}