[lucene-solr] branch branch_8_0 updated: SOLR-13252: Fix an NPE when setting a "policy" property for an existing collection.

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch branch_8_0
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8_0 by this push:
     new 7e8a2df  SOLR-13252: Fix an NPE when setting a "policy" property for an existing collection.
7e8a2df is described below

commit 7e8a2df254b47b2b57d00a3bd75164d43c019abf
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Feb 14 21:37:10 2019 +0100

    SOLR-13252: Fix an NPE when setting a "policy" property for an existing collection.
---
 .../solr/cloud/api/collections/OverseerCollectionMessageHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
index e67fc7f..61ba3b7 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
@@ -684,7 +684,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
         if (!updateKey.equals(ZkStateReader.COLLECTION_PROP)
             && !updateKey.equals(Overseer.QUEUE_OPERATION)
             && updateEntry.getValue() != null // handled below in a separate conditional
-            && !collection.get(updateKey).equals(updateEntry.getValue())){
+            && !updateEntry.getValue().equals(collection.get(updateKey))) {
           areChangesVisible = false;
           break;
         }