Skip to content

Commit ad7c358

Browse files
authored
Merge pull request #556 from scribe/5_0_autogen
This prevents a null pointer in the case where the versionId is null
2 parents 5c20b56 + 704de1b commit ad7c358

File tree

1 file changed

+3
-2
lines changed
  • ds3-sdk/src/main/java/com/spectralogic/ds3client/models/bulk

1 file changed

+3
-2
lines changed

ds3-sdk/src/main/java/com/spectralogic/ds3client/models/bulk/Ds3Object.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
2020
import com.spectralogic.ds3client.serializer.Views;
2121

22+
import java.util.Objects;
2223
import java.util.UUID;
2324

2425
public class Ds3Object {
@@ -124,8 +125,8 @@ public boolean equals(final Object obj) {
124125
return false;
125126
}
126127
final Ds3Object ds3Obj = (Ds3Object) obj;
127-
return ds3Obj.getName().equals(this.getName()) &&
128+
return Objects.equals(ds3Obj.getName(), this.getName()) &&
128129
ds3Obj.getSize() == this.getSize() &&
129-
ds3Obj.getVersionId().equals(this.getVersionId());
130+
Objects.equals(ds3Obj.versionId, this.getVersionId());
130131
}
131132
}

0 commit comments

Comments
 (0)