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 2013/03/16 18:53:31 UTC

svn commit: r1457281 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java

Author: markrmiller
Date: Sat Mar 16 17:53:31 2013
New Revision: 1457281

URL: http://svn.apache.org/r1457281
Log:
SOLR-4573: Accessing Admin UI files in SolrCloud mode logs warnings.

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1457281&r1=1457280&r2=1457281&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat Mar 16 17:53:31 2013
@@ -134,6 +134,9 @@ Bug Fixes
 * SOLR-4592: DefaultSolrCoreState#doRecovery needs to check the CoreContainer
   shutdown flag inside the recoveryLock sync block. (Mark Miller)
 
+* SOLR-4573: Accessing Admin UI files in SolrCloud mode logs warnings.
+  (Mark Miller, Phil John)
+
 Optimizations
 ----------------------
 

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=1457281&r1=1457280&r2=1457281&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 Sat Mar 16 17:53:31 2013
@@ -255,10 +255,12 @@ public class SolrDispatchFilter implemen
             } else {
               if (!retry) {
                 // we couldn't find a core to work with, try reloading aliases
+                // TODO: it would be nice if admin ui elements skipped this...
                 ZkStateReader reader = cores.getZkController()
                     .getZkStateReader();
                 reader.updateAliases();
                 doFilter(request, response, chain, true);
+                return;
               }
             }
           }