You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2015/04/10 05:38:22 UTC
svn commit: r1672533 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
Author: ryan
Date: Fri Apr 10 03:38:22 2015
New Revision: 1672533
URL: http://svn.apache.org/r1672533
Log:
Merged revision(s) 1672531 from lucene/dev/branches/branch_5x:
SOLR-7373: let AbstractSpatialFieldType set the context
........
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java?rev=1672533&r1=1672532&r2=1672533&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java Fri Apr 10 03:38:22 2015
@@ -113,11 +113,13 @@ public abstract class AbstractSpatialFie
protected void init(IndexSchema schema, Map<String, String> args) {
super.init(schema, args);
- //Solr expects us to remove the parameters we've used.
- MapListener<String, String> argsWrap = new MapListener<>(args);
- ctx = SpatialContextFactory.makeSpatialContext(argsWrap, schema.getResourceLoader().getClassLoader());
- args.keySet().removeAll(argsWrap.getSeenKeys());
-
+ if(ctx==null) { // subclass can set this directly
+ //Solr expects us to remove the parameters we've used.
+ MapListener<String, String> argsWrap = new MapListener<>(args);
+ ctx = SpatialContextFactory.makeSpatialContext(argsWrap, schema.getResourceLoader().getClassLoader());
+ args.keySet().removeAll(argsWrap.getSeenKeys());
+ }
+
final String unitsErrMsg = "units parameter is deprecated, please use distanceUnits instead for field types with class " +
getClass().getSimpleName();
this.units = args.remove("units");//deprecated