svn commit: r1672531 - /lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java

[ry...@apache.org]

Author: ryan
Date: Fri Apr 10 03:33:37 2015
New Revision: 1672531

URL: http://svn.apache.org/r1672531
Log:
SOLR-7373: let AbstractSpatialFieldType set the context

Modified:
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java?rev=1672531&r1=1672530&r2=1672531&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java Fri Apr 10 03:33:37 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