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/19 05:39:04 UTC

svn commit: r1458130 - in /lucene/dev/branches/lucene_solr_4_2: ./ solr/ solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java

Author: markrmiller
Date: Tue Mar 19 04:39:04 2013
New Revision: 1458130

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

Modified:
    lucene/dev/branches/lucene_solr_4_2/   (props changed)
    lucene/dev/branches/lucene_solr_4_2/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_2/solr/CHANGES.txt
    lucene/dev/branches/lucene_solr_4_2/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_2/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java

Modified: lucene/dev/branches/lucene_solr_4_2/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_2/solr/CHANGES.txt?rev=1458130&r1=1458129&r2=1458130&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_2/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_2/solr/CHANGES.txt Tue Mar 19 04:39:04 2013
@@ -79,6 +79,9 @@ Bug Fixes
 * SOLR-4595: CachingDirectoryFactory#close can throw a concurrent 
   modification exception. (Mark Miller)
 
+* SOLR-4573: Accessing Admin UI files in SolrCloud mode logs warnings.
+  (Mark Miller, Phil John)
+
 Optimizations
 ----------------------
 

Modified: lucene/dev/branches/lucene_solr_4_2/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_2/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1458130&r1=1458129&r2=1458130&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_2/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/branches/lucene_solr_4_2/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Tue Mar 19 04:39:04 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;
               }
             }
           }