svn commit: r1702057 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/core/SolrResourceLoader.java

[el...@apache.org]

Author: elyograg
Date: Wed Sep  9 16:55:33 2015
New Revision: 1702057

URL: http://svn.apache.org/r1702057
Log:
SOLR-6188: Revert r1701999

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

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1702057&r1=1702056&r2=1702057&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Sep  9 16:55:33 2015
@@ -265,9 +265,6 @@ Bug Fixes
 
 * SOLR-7988: SolrJ could not make requests to handlers with '/admin/' prefix (noble , ludovic Boutros)
 
-* SOLR-6188: Fixed error loading ICU classes with solr. prefix.  Now jars in
-  the default sharedLib directory are only loaded once. (Shawn Heisey)
-
 * SOLR-7990: Use of timeAllowed can cause incomplete filters to be cached and incorrect
   results to be returned on subsequent requests. (Erick Erickson, yonik)
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=1702057&r1=1702056&r2=1702057&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java Wed Sep  9 16:55:33 2015
@@ -140,6 +140,8 @@ public class SolrResourceLoader implemen
     }
     
     this.classLoader = createClassLoader(null, parent);
+    addToClassLoader("./lib/", null, true);
+    reloadLuceneSPI();
     this.coreProperties = coreProperties;
   }