svn commit: r1659786 - in /lucene/dev/branches/lucene_solr_5_0/solr/core/src: java/org/apache/solr/core/RequestHandlers.java test/org/apache/solr/core/TestDynamicLoading.java

[no...@apache.org]

Author: noble
Date: Sat Feb 14 12:50:25 2015
New Revision: 1659786

URL: http://svn.apache.org/r1659786
Log:
SOLR-7106: Disable dynamic class loading by default

Modified:
    lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
    lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java

Modified: lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/core/RequestHandlers.java?rev=1659786&r1=1659785&r2=1659786&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/core/RequestHandlers.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/core/RequestHandlers.java Sat Feb 14 12:50:25 2015
@@ -67,7 +67,6 @@ public final class RequestHandlers {
       new ConcurrentHashMap<>() ;
   private final Map<String, SolrRequestHandler> immutableHandlers = Collections.unmodifiableMap(handlers) ;
 
-  public static final boolean disableExternalLib = Boolean.parseBoolean(System.getProperty("disable.external.lib", "false"));
 
   /**
    * Trim the trailing '/' if it's there, and convert null to empty string.
@@ -342,7 +341,7 @@ public final class RequestHandlers {
     @Override
     public String getDescription()
     {
-      if( _handler == null ) {
+      if (_handler == null || _handler instanceof LazyRequestHandlerWrapper) {
         return getName();
       }
       return _handler.getDescription();
@@ -350,7 +349,7 @@ public final class RequestHandlers {
     
     @Override
     public String getVersion() {
-      if( _handler != null ) {
+      if (_handler != null && !(_handler instanceof LazyRequestHandlerWrapper)) {
         return _handler.getVersion();
       }
       return null;
@@ -377,7 +376,7 @@ public final class RequestHandlers {
 
     @Override
     public NamedList getStatistics() {
-      if( _handler != null ) {
+      if (_handler != null && !(_handler instanceof LazyRequestHandlerWrapper)) {
         return _handler.getStatistics();
       }
       NamedList<String> lst = new SimpleOrderedMap<>();
@@ -425,7 +424,7 @@ public final class RequestHandlers {
       super.init(info);
       this.lib = _pluginInfo.attributes.get("lib");
 
-      if(disableExternalLib){
+      if (!Boolean.parseBoolean(System.getProperty("enable.runtime.lib", "false"))) {
         errMsg = "ERROR external library loading is disabled";
         unrecoverable = true;
         _handler = this;

Modified: lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java?rev=1659786&r1=1659785&r2=1659786&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java Sat Feb 14 12:50:25 2015
@@ -27,6 +27,7 @@ import org.apache.solr.util.RESTfulServe
 import org.apache.solr.util.RestTestHarness;
 import org.apache.solr.util.SimplePostTool;
 import org.junit.After;
+import org.junit.BeforeClass;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,6 +57,11 @@ public class TestDynamicLoading extends
       restTestHarnesses.add(harness);
     }
   }
+  @BeforeClass
+  public static void enableRuntimeLib() throws Exception {
+    System.setProperty("enable.runtime.lib", "true");
+  }
+
 
   @After
   public void testDown() throws Exception {
@@ -86,7 +92,7 @@ public class TestDynamicLoading extends
 
     Map map = TestSolrConfigHandler.getRespMap("/test1?wt=json", client);
 
-    assertNotNull(map = (Map) map.get("error"));
+    assertNotNull(TestBlobHandler.getAsString(map) ,  map = (Map) map.get("error"));
     assertEquals(".system collection not available", map.get("msg"));
 
     HttpSolrClient randomClient = (HttpSolrClient) clients.get(random().nextInt(clients.size()));