SOLR-9554: fix NullPointerException when cores move schema.xml to

managed-schema concurrently. No new test is added yet.
This commit is contained in:
Mikhail Khludnev 2016-09-30 08:03:20 +03:00
parent 5adb8f1bd5
commit 1c614e1d4d
2 changed files with 4 additions and 0 deletions

View File

@ -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
----------------------

View File

@ -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) {