You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by el...@apache.org on 2015/09/09 18:54:23 UTC

svn commit: r1702056 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java

Author: elyograg
Date: Wed Sep  9 16:54:22 2015
New Revision: 1702056

URL: http://svn.apache.org/r1702056
Log:
SOLR-6188: Revert 1702006 (backport of r1701999)

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1702056&r1=1702055&r2=1702056&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Wed Sep  9 16:54:22 2015
@@ -177,9 +177,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/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=1702056&r1=1702055&r2=1702056&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java Wed Sep  9 16:54:22 2015
@@ -140,6 +140,8 @@ public class SolrResourceLoader implemen
     }
     
     this.classLoader = createClassLoader(null, parent);
+    addToClassLoader("./lib/", null, true);
+    reloadLuceneSPI();
     this.coreProperties = coreProperties;
   }