svn commit: r690432 - in /lucene/solr/branches/branch-1.3/src: java/org/apache/solr/core/SolrCore.java test/org/apache/solr/core/TestConfig.java

[hossman]

Author: hossman
Date: Fri Aug 29 17:07:15 2008
New Revision: 690432

URL: http://svn.apache.org/viewvc?rev=690432&view=rev
Log:
merge r690430 to 1.3: SOLR-740 bugfix for legacy gettableFiles support

Modified:
    lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/SolrCore.java
    
lucene/solr/branches/branch-1.3/src/test/org/apache/solr/core/TestConfig.java

Modified: 
lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/SolrCore.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/SolrCore.java?rev=690432&r1=690431&r2=690432&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/SolrCore.java 
(original)
+++ lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/SolrCore.java 
Fri Aug 29 17:07:15 2008
@@ -1395,7 +1395,7 @@
       log.warning( 
           "solrconfig.xml uses deprecated <admin/gettableFiles>, Please "+
           "update your config to use the ShowFileRequestHandler." );
-      if( getRequestHandler( "admin/file" ) == null ) {
+      if( getRequestHandler( "/admin/file" ) == null ) {
         NamedList<String> invariants = new NamedList<String>();
         
         // Hide everything...
@@ -1418,7 +1418,7 @@
         args.add( "invariants", invariants );
         ShowFileRequestHandler handler = new ShowFileRequestHandler();
         handler.init( args );
-        reqHandlers.register("admin/file", handler);
+        reqHandlers.register("/admin/file", handler);
 
         log.warning( "adding ShowFileRequestHandler with hidden files: "+hide 
);
       }

Modified: 
lucene/solr/branches/branch-1.3/src/test/org/apache/solr/core/TestConfig.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.3/src/test/org/apache/solr/core/TestConfig.java?rev=690432&r1=690431&r2=690432&view=diff
==============================================================================
--- 
lucene/solr/branches/branch-1.3/src/test/org/apache/solr/core/TestConfig.java 
(original)
+++ 
lucene/solr/branches/branch-1.3/src/test/org/apache/solr/core/TestConfig.java 
Fri Aug 29 17:07:15 2008
@@ -68,7 +68,7 @@
   public void testAutomaticDeprecationSupport()
   {
     // make sure the "admin/file" handler is registered
-    ShowFileRequestHandler handler = (ShowFileRequestHandler) 
h.getCore().getRequestHandler( "admin/file" );
+    ShowFileRequestHandler handler = (ShowFileRequestHandler) 
h.getCore().getRequestHandler( "/admin/file" );
     assertTrue( "file handler should have been automatically registered", 
handler!=null );
 
     //System.out.println( handler.getHiddenFiles() );
@@ -76,4 +76,4 @@
     assertFalse( handler.getHiddenFiles().contains( "scheam.xml".toUpperCase() 
) );
     assertTrue( handler.getHiddenFiles().contains( "PROTWORDS.TXT" ) );
   }
-}
\ No newline at end of file
+}