lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1142180 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/backwards/ lucene/backwards/src/test-framework/ lucene/backwards/src/test/ solr/ solr/CHANGES.txt solr/src/java/org/apache/solr/handler/PingRequestHandler.java
Date Sat, 02 Jul 2011 09:04:30 GMT
Author: uschindler
Date: Sat Jul  2 09:04:29 2011
New Revision: 1142180

URL: http://svn.apache.org/viewvc?rev=1142180&view=rev
Log:
SOLR-2631: PingRequestHandler should not allow to ping itsself using "qt" param to prevent
infinite loop

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test-framework/   (props changed)
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/CHANGES.txt
    lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/PingRequestHandler.java

Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1142180&r1=1142179&r2=1142180&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Sat Jul  2 09:04:29 2011
@@ -54,6 +54,9 @@ Bug Fixes
 * SOLR-2625: TermVectorComponent throws NPE if TF-IDF option is used without DF
   option. (Daniel Erenrich, Simon Willnauer)
 
+* SOLR-2631: PingRequestHandler should not allow to ping itsself using "qt"
+  param to prevent infinite loop. (Edoardo Tosca, Uwe Schindler)
+
 Other Changes
 ----------------------
 

Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/PingRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/PingRequestHandler.java?rev=1142180&r1=1142179&r2=1142180&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/PingRequestHandler.java
(original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/PingRequestHandler.java
Sat Jul  2 09:04:29 2011
@@ -56,6 +56,11 @@ public class PingRequestHandler extends 
           "Unknown RequestHandler: "+qt );
     }
     
+    if( handler instanceof PingRequestHandler ) {
+      throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, 
+          "Cannot execute the PingRequestHandler recursively" );
+    }
+    
     // Execute the ping query and catch any possible exception
     Throwable ex = null;
     try {



Mime
View raw message