Apache Solr open-source search software
SOLR-3284: fix RemoteSolrException NPE when remoteError is null (#4637)
Serhiy Bzhezytskyy59b23fd8f184
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/RemoteSolrException.java b/solr/solrj/src/java/org/apache/solr/client/solrj/RemoteSolrException.javaindex 4552fe0cd9d..a8110be3c80 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/RemoteSolrException.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/RemoteSolrException.java@@ -63,7 +63,7 @@ public final class RemoteSolrException extends SolrException {public RemoteSolrException(String remoteHost, int code, Object remoteError, boolean skipRetry) {super(ErrorCode.getErrorCode(code), "Error from server at " + remoteHost);this.skipRetry = skipRetry;- setDetails(List.of(Map.of("remoteHost", remoteHost, "remoteError", remoteError)));+ setDetails(List.of(Utils.makeMap("remoteHost", remoteHost, "remoteError", remoteError)));if (remoteError != null) {String remoteErrorMessageSuffix = getRemoteErrorMessageSuffix(remoteError, "");if (remoteErrorMessageSuffix.length() > 2) {diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/RemoteSolrExceptionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/RemoteSolrExceptionTest.javanew file mode 100644index 00000000000..cb211e90925--- /dev/null+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/RemoteSolrExceptionTest.java@@ -0,0 +1,54 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.apache.solr.client.solrj;++import java.util.List;+import java.util.Map;+import org.apache.solr.SolrTestCase;+import org.junit.Test;++/** Unit tests for {@link RemoteSolrException}. */+public class RemoteSolrExceptionTest extends SolrTestCase {++ /**+ * A null remoteError must not throw: it happens whenever the server's error body can't be parsed+ * (e.g. ConcurrentUpdateSolrClient passes a null error), and the constructor is expected to+ * tolerate it. The consumers of the resulting exception must also tolerate the null.+ */+ @Test+ public void testNullRemoteErrorDoesNotThrow() {+ RemoteSolrException e = new RemoteSolrException("http://host:8983/solr", 500, null);+ assertEquals(500, e.code());+ assertNull(e.getRemoteErrorObject());++ // consumers of the exception must tolerate the null remoteError entry+ assertNotNull(e.getMessage());+ List<Map<String, Object>> details = e.getDetails();+ assertEquals(1, details.size());+ assertEquals("http://host:8983/solr", details.get(0).get("remoteHost"));+ assertNull(details.get(0).get("remoteError"));+ }++ /** A non-null remoteError is still recorded and readable back. */+ @Test+ public void testRemoteErrorIsRecorded() {+ Map<String, Object> remoteError = Map.of("msg", "boom", "code", 500);+ RemoteSolrException e = new RemoteSolrException("http://host:8983/solr", 500, remoteError);+ assertEquals(500, e.code());+ assertEquals(remoteError, e.getRemoteErrorObject());+ }+}