You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mk...@apache.org on 2016/09/30 05:03:25 UTC
lucene-solr:master: SOLR-9554: fix NullPointerException when cores
move schema.xml to managed-schema concurrently. No new test added yet.
Repository: lucene-solr
Updated Branches:
refs/heads/master 787d905ed -> 64b0c91df
SOLR-9554: fix NullPointerException when cores move schema.xml to
managed-schema concurrently. No new test 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/64b0c91d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/64b0c91d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/64b0c91d
Branch: refs/heads/master
Commit: 64b0c91df16b09d430957092f71b4991c2a66db2
Parents: 787d905
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Fri Sep 30 08:03:20 2016 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Fri Sep 30 08:03:20 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/64b0c91d/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 371865b..45a8c8b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -138,6 +138,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/64b0c91d/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) {