Skip to content

Improper equals override is fixed to prevent NullPointerException #6938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clintropolis merged 3 commits into from
Feb 6, 2019
Merged

Improper equals override is fixed to prevent NullPointerException #6938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d82fdc9
Improper equals override is fixed to prevent NullPointerException
kamaci Jan 29, 2019
74a8871
Fixed curly brace indentation.
kamaci Jan 29, 2019
2331f5c
Test method is added for equals method of TaskLockPosse class.
kamaci Feb 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,16 +1073,13 @@ public boolean equals(Object o)
return true;
}

if (!getClass().equals(o.getClass())) {
if (o == null || !getClass().equals(o.getClass())) {
return false;
}

final TaskLockPosse that = (TaskLockPosse) o;
if (!taskLock.equals(that.taskLock)) {
return false;
}

return taskIds.equals(that.taskIds);
TaskLockPosse that = (TaskLockPosse) o;
return java.util.Objects.equals(taskLock, that.taskLock) &&
java.util.Objects.equals(taskIds, that.taskIds);
}

@Override
Expand Down
30 changes: 30 additions & 0 deletions indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockboxTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,36 @@ public void testFindLockPosseAfterRevokeWithDifferentLockIntervals() throws Entr
Assert.assertTrue(lowLockPosse.getTaskLock().isRevoked());
}

@Test
public void testLockPosseEquals()
{
final Task task1 = NoopTask.create();
final Task task2 = NoopTask.create();

TaskLock taskLock1 = new TaskLock(TaskLockType.EXCLUSIVE,
task1.getGroupId(),
task1.getDataSource(),
Intervals.of("2018/2019"),
"v1",
task1.getPriority());

TaskLock taskLock2 = new TaskLock(TaskLockType.EXCLUSIVE,
task2.getGroupId(),
task2.getDataSource(),
Intervals.of("2018/2019"),
"v2",
task2.getPriority());

TaskLockPosse taskLockPosse1 = new TaskLockPosse(taskLock1);
TaskLockPosse taskLockPosse2 = new TaskLockPosse(taskLock2);
TaskLockPosse taskLockPosse3 = new TaskLockPosse(taskLock1);

Assert.assertNotEquals(taskLockPosse1, null);
Assert.assertNotEquals(null, taskLockPosse1);
Assert.assertNotEquals(taskLockPosse1, taskLockPosse2);
Assert.assertEquals(taskLockPosse1, taskLockPosse3);
}

private Set<TaskLock> getAllLocks(List<Task> tasks)
{
return tasks.stream()
Expand Down