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/02/10 17:42:58 UTC
svn commit: r1242843 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
Author: markrmiller
Date: Fri Feb 10 16:42:57 2012
New Revision: 1242843
URL: http://svn.apache.org/viewvc?rev=1242843&view=rev
Log:
SOLR-2957: fix default core behavior when in zk mode
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1242843&r1=1242842&r2=1242843&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Fri Feb 10 16:42:57 2012
@@ -184,9 +184,7 @@ public class SolrDispatchFilter implemen
}
}
if (core == null) {
- if (cores.isZooKeeperAware() && corename.length() == 0) {
- core = cores.getCore("");
- } else if (!cores.isZooKeeperAware()) {
+ if (!cores.isZooKeeperAware() ) {
core = cores.getCore("");
}
}
@@ -199,6 +197,9 @@ public class SolrDispatchFilter implemen
if (core != null) {
// we found a core, update the path
path = path.substring( idx );
+ } else {
+ // try the default core
+ core = cores.getCore("");
}
// TODO: if we couldn't find it locally, look on other nodes
}