This is an automated email from the ASF dual-hosted git repository.
cwylie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new edfbdbf fix NPE when calling TaskLocation.hashCode with null host
(#10708)
edfbdbf is described below
commit edfbdbfc97861e36e8d3ad6240cd45427c99a0d9
Author: Clint Wylie <[email protected]>
AuthorDate: Thu Dec 24 15:30:54 2020 -0800
fix NPE when calling TaskLocation.hashCode with null host (#10708)
---
.../org/apache/druid/indexer/TaskLocation.java | 31 +++++++++-----------
.../org/apache/druid/indexer/TaskLocationTest.java | 33 ++++++++++++++++++++++
2 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/core/src/main/java/org/apache/druid/indexer/TaskLocation.java
b/core/src/main/java/org/apache/druid/indexer/TaskLocation.java
index a1dee80..186d7b1 100644
--- a/core/src/main/java/org/apache/druid/indexer/TaskLocation.java
+++ b/core/src/main/java/org/apache/druid/indexer/TaskLocation.java
@@ -29,6 +29,7 @@ public class TaskLocation
{
private static final TaskLocation UNKNOWN = new TaskLocation(null, -1, -1);
+ @Nullable
private final String host;
private final int port;
private final int tlsPort;
@@ -75,6 +76,16 @@ public class TaskLocation
}
@Override
+ public String toString()
+ {
+ return "TaskLocation{" +
+ "host='" + host + '\'' +
+ ", port=" + port +
+ ", tlsPort=" + tlsPort +
+ '}';
+ }
+
+ @Override
public boolean equals(Object o)
{
if (this == o) {
@@ -83,29 +94,13 @@ public class TaskLocation
if (o == null || getClass() != o.getClass()) {
return false;
}
-
TaskLocation that = (TaskLocation) o;
-
- return port == that.port && tlsPort == that.tlsPort &&
- Objects.equals(host, that.host);
+ return port == that.port && tlsPort == that.tlsPort &&
Objects.equals(host, that.host);
}
@Override
public int hashCode()
{
- int result = host.hashCode();
- result = 31 * result + port;
- result = 31 * result + tlsPort;
- return result;
- }
-
- @Override
- public String toString()
- {
- return "TaskLocation{" +
- "host='" + host + '\'' +
- ", port=" + port +
- ", tlsPort=" + tlsPort +
- '}';
+ return Objects.hash(host, port, tlsPort);
}
}
diff --git a/core/src/test/java/org/apache/druid/indexer/TaskLocationTest.java
b/core/src/test/java/org/apache/druid/indexer/TaskLocationTest.java
new file mode 100644
index 0000000..bb751fa
--- /dev/null
+++ b/core/src/test/java/org/apache/druid/indexer/TaskLocationTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.druid.indexer;
+
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import org.junit.Test;
+
+public class TaskLocationTest
+{
+ @Test
+ public void testEqualsAndHashCode()
+ {
+ EqualsVerifier.forClass(TaskLocation.class).usingGetClass().verify();
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
