mirror of https://github.com/apache/druid.git
fix NPE when calling TaskLocation.hashCode with null host (#10708)
This commit is contained in:
parent
74fbdd322d
commit
edfbdbfc97
|
@ -29,6 +29,7 @@ public class TaskLocation
|
||||||
{
|
{
|
||||||
private static final TaskLocation UNKNOWN = new TaskLocation(null, -1, -1);
|
private static final TaskLocation UNKNOWN = new TaskLocation(null, -1, -1);
|
||||||
|
|
||||||
|
@Nullable
|
||||||
private final String host;
|
private final String host;
|
||||||
private final int port;
|
private final int port;
|
||||||
private final int tlsPort;
|
private final int tlsPort;
|
||||||
|
@ -74,31 +75,6 @@ public class TaskLocation
|
||||||
return tlsPort;
|
return tlsPort;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object o)
|
|
||||||
{
|
|
||||||
if (this == o) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (o == null || getClass() != o.getClass()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
TaskLocation that = (TaskLocation) o;
|
|
||||||
|
|
||||||
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
|
@Override
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
|
@ -108,4 +84,23 @@ public class TaskLocation
|
||||||
", tlsPort=" + tlsPort +
|
", tlsPort=" + tlsPort +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o)
|
||||||
|
{
|
||||||
|
if (this == o) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (o == null || getClass() != o.getClass()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
TaskLocation that = (TaskLocation) o;
|
||||||
|
return port == that.port && tlsPort == that.tlsPort && Objects.equals(host, that.host);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode()
|
||||||
|
{
|
||||||
|
return Objects.hash(host, port, tlsPort);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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();
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue