lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From no...@apache.org
Subject lucene-solr:master: SOLR-9179: NPE in IndexSchema using IBM JDK
Date Thu, 04 Aug 2016 06:50:53 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/master 2c4542ea0 -> 17797673f


SOLR-9179: NPE in IndexSchema using IBM JDK


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/17797673
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/17797673
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/17797673

Branch: refs/heads/master
Commit: 17797673f2eb152c09af022e5d2e03bf5c1d584b
Parents: 2c4542e
Author: Noble Paul <noble@apache.org>
Authored: Thu Aug 4 12:20:31 2016 +0530
Committer: Noble Paul <noble@apache.org>
Committed: Thu Aug 4 12:20:31 2016 +0530

----------------------------------------------------------------------
 solr/CHANGES.txt                                              | 2 ++
 solr/core/src/java/org/apache/solr/handler/SchemaHandler.java | 2 +-
 solr/core/src/java/org/apache/solr/schema/IndexSchema.java    | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/17797673/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 49fae34..787edee 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -189,6 +189,8 @@ Bug Fixes
 
 * SOLR-9308: Fix distributed RTG to forward request params, fixes fq and non-default fl params
(hossman)
 
+* SOLR-9179: NPE in IndexSchema using IBM JDK (noble, Colvin Cowie)
+
 Optimizations
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/17797673/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
index 063c3d4..35e463b 100644
--- a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
@@ -185,7 +185,7 @@ public class SchemaHandler extends RequestHandlerBase implements SolrCoreAware,
           if (parts.get(0).isEmpty()) parts.remove(0);
           if (parts.size() > 1 && level2.containsKey(parts.get(1))) {
             String realName = parts.get(1);
-            String fieldName = IndexSchema.SchemaProps.nameMapping.get(realName);
+            String fieldName = IndexSchema.nameMapping.get(realName);
 
             String pathParam = level2.get(realName);
             if (parts.size() > 2) {

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/17797673/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
index 43d6814..c48518c 100644
--- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
@@ -1500,10 +1500,12 @@ public class IndexSchema {
               (v1, v2) -> v2,
               LinkedHashMap::new));
     }
-    public static Map<String,String> nameMapping = Collections.unmodifiableMap(Stream.of(Handler.values())
-        .collect(Collectors.toMap(Handler::getNameLower , Handler::getRealName)));
   }
 
+  public static Map<String,String> nameMapping = Collections.unmodifiableMap(Stream.of(SchemaProps.Handler.values())
+      .collect(Collectors.toMap(SchemaProps.Handler::getNameLower , SchemaProps.Handler::getRealName)));
+
+
   public Map<String, Object> getNamedPropertyValues(String name, SolrParams params)
{
     return new SchemaProps(name, params, this).toMap();
 


Mime
View raw message