svn commit: r1701999 - 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 13:15:22 2015
New Revision: 1701999

URL: http://svn.apache.org/r1701999
Log:
SOLR-6188: Only load jars in default sharedLib once.

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=1701999&r1=1701998&r2=1701999&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Sep  9 13:15:22 2015
@@ -265,6 +265,8 @@ 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)
 
 ==================  5.3.0 ==================
 

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=1701999&r1=1701998&r2=1701999&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 13:15:22 2015
@@ -140,8 +140,6 @@ public class SolrResourceLoader implemen
     }
     
     this.classLoader = createClassLoader(null, parent);
-    addToClassLoader("./lib/", null, true);
-    reloadLuceneSPI();
     this.coreProperties = coreProperties;
   }