lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject lucene-solr:branch_6x: SOLR-9554: fix NullPointerException when cores move schema.xml to managed-schema concurrently. No new test is added yet.
Date Fri, 30 Sep 2016 05:15:48 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 5adb8f1bd -> 1c614e1d4


SOLR-9554: fix NullPointerException when cores move schema.xml to
managed-schema concurrently. No new test is added yet. 

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

Branch: refs/heads/branch_6x
Commit: 1c614e1d4df4915dd19eb96f478a0379deecef69
Parents: 5adb8f1
Author: Mikhail Khludnev <mkhl@apache.org>
Authored: Fri Sep 30 08:03:20 2016 +0300
Committer: Mikhail Khludnev <mkhl@apache.org>
Committed: Fri Sep 30 08:10:52 2016 +0300

----------------------------------------------------------------------
 solr/CHANGES.txt                                                  | 3 +++
 .../java/org/apache/solr/schema/ManagedIndexSchemaFactory.java    | 1 +
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1c614e1d/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5856666..98ee88c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -107,6 +107,9 @@ Bug Fixes
 * SOLR-9504: A replica with an empty index becomes the leader even when other more qualified
replicas
   are in line. (shalin)
 
+* SOLR-9554: Fix NullPointerException when cores are loaded in parallel and switch schema.xml
to managed-scheme.
+ (Alan Woodward, Mikhail Khludnev)
+
 Optimizations
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1c614e1d/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
index 6140a0f..66d947e 100644
--- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
+++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
@@ -152,6 +152,7 @@ public class ManagedIndexSchemaFactory extends IndexSchemaFactory implements
Sol
             byte[] data = zkClient.getData(managedSchemaPath, null, stat, true);
             schemaZkVersion = stat.getVersion();
             schemaInputStream = new ByteArrayInputStream(data);
+            loadedResource = managedSchemaPath;
             warnIfNonManagedSchemaExists();
           } catch (Exception e1) {
             if (e1 instanceof InterruptedException) {


Mime
View raw message