You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/09/02 17:12:11 UTC
svn commit: r1700839 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/CHANGES.txt
lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java
lucene/tools/ lucene/tools/junit4/tests.policy
Author: rmuir
Date: Wed Sep 2 15:12:10 2015
New Revision: 1700839
URL: http://svn.apache.org/r1700839
Log:
LUCENE-6774: Remove solr hack in MorfologikFilter
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java
lucene/dev/branches/branch_5x/lucene/tools/ (props changed)
lucene/dev/branches/branch_5x/lucene/tools/junit4/tests.policy
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1700839&r1=1700838&r2=1700839&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Wed Sep 2 15:12:10 2015
@@ -53,6 +53,8 @@ Bug Fixes
* LUCENE-6748: UsageTrackingQueryCachingPolicy no longer caches trivial queries
like MatchAllDocsQuery. (Adrien Grand)
+* LUCENE-6774: Remove solr hack in MorfologikFilter. (Robert Muir)
+
Other
* LUCENE-6174: Improve "ant eclipse" to select right JRE for building.
Modified: lucene/dev/branches/branch_5x/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java?rev=1700839&r1=1700838&r2=1700839&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java Wed Sep 2 15:12:10 2015
@@ -76,17 +76,8 @@ public class MorfologikFilter extends To
public MorfologikFilter(final TokenStream in, final String dict) {
super(in);
this.input = in;
-
- // SOLR-4007: temporarily substitute context class loader to allow finding dictionary resources.
- Thread me = Thread.currentThread();
- ClassLoader cl = me.getContextClassLoader();
- try {
- me.setContextClassLoader(morfologik.stemming.Dictionary.class.getClassLoader());
- this.stemmer = new DictionaryLookup(morfologik.stemming.Dictionary.getForLanguage(dict));
- this.lemmaList = Collections.emptyList();
- } finally {
- me.setContextClassLoader(cl);
- }
+ this.stemmer = new DictionaryLookup(morfologik.stemming.Dictionary.getForLanguage(dict));
+ this.lemmaList = Collections.emptyList();
}
/**
Modified: lucene/dev/branches/branch_5x/lucene/tools/junit4/tests.policy
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/tools/junit4/tests.policy?rev=1700839&r1=1700838&r2=1700839&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/tools/junit4/tests.policy (original)
+++ lucene/dev/branches/branch_5x/lucene/tools/junit4/tests.policy Wed Sep 2 15:12:10 2015
@@ -67,8 +67,6 @@ grant {
permission java.lang.RuntimePermission "accessClassInPackage.sun.util";
// needed for test of IOUtils.spins (maybe it can be avoided)
permission java.lang.RuntimePermission "getFileStoreAttributes";
- // analyzers/morfologik: needed for a horrible context classloader hack for solr in morfologikfilter: nuke this
- permission java.lang.RuntimePermission "setContextClassLoader";
// analyzers/uima: needed by UIMA message localization... (?)
permission java.lang.RuntimePermission "createSecurityManager";
permission java.lang.RuntimePermission "createClassLoader";