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/10/09 21:28:12 UTC
svn commit: r1707800 - 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: Fri Oct 9 19:28:12 2015
New Revision: 1707800
URL: http://svn.apache.org/viewvc?rev=1707800&view=rev
Log:
SOLR-6188: Only load resources in SOLRHOME/lib once. (backport trunk r1707630)
Also indirectly incorporates r1707771 - fixing my error in CHANGES.txt.
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=1707800&r1=1707799&r2=1707800&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Fri Oct 9 19:28:12 2015
@@ -145,6 +145,11 @@ Bug Fixes
* SOLR-7967: AddSchemaFieldsUpdateProcessorFactory does not check if the ConfigSet is immutable (Gregory Chanan)
+* SOLR-6188: Skip the automatic loading of resources in the "lib" subdirectory
+ by SolrResourceLoader, but only if we are loading resources from the solr
+ home directory. Fixes the inability to use ICU analysis components with a
+ "solr." prefix on the classname. (Shawn Heisey)
+
Optimizations
----------------------
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=1707800&r1=1707799&r2=1707800&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 Fri Oct 9 19:28:12 2015
@@ -140,8 +140,16 @@ public class SolrResourceLoader implemen
}
this.classLoader = createClassLoader(null, parent);
- addToClassLoader("./lib/", null, true);
- reloadLuceneSPI();
+ /*
+ * Skip the lib subdirectory when we are loading from the solr home.
+ * Otherwise load it, so core lib directories still get loaded.
+ * The default sharedLib will pick this up later, and if the user has
+ * changed sharedLib, then we don't want to load that location anyway.
+ */
+ if (! this.instanceDir.equals(SolrResourceLoader.locateSolrHome())) {
+ addToClassLoader("./lib/", null, true);
+ reloadLuceneSPI();
+ }
this.coreProperties = coreProperties;
}