Skip to content

Commit 133aacd

Browse files
committed
qos: Uncaught NullPointerException due to QoS being set to null
Motivation: null is a valid value for FileAttribute.QOS_POLICY, however, it is not a valid value to be encapsulated within an Optional. Modification: Update Optional.of for Optional.ofNullable since the later will take into account null as a value and return Optional.empty() where Optional.of will not and hence throw the NPE. Result: QosPolicy can still be set to null and we will no longer show a NPE. Acked-by: Dmitry Litvintsev Target: master, 10.2, 10.1, 10.0 and 9.2 Require-book: no Require-notes: no (cherry picked from commit 466c97e) Signed-off-by: khys95 <[email protected]>
1 parent 2e9c6b3 commit 133aacd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

modules/dcache-vehicles/src/main/java/org/dcache/vehicles/FileAttributes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ public String toString() {
831831

832832
@Nonnull
833833
private <T> Optional<T> toOptional(FileAttribute attribute, T value) {
834-
return isDefined(attribute) ? Optional.of(value) : Optional.empty();
834+
return isDefined(attribute) ? Optional.ofNullable(value) : Optional.empty();
835835
}
836836

837837
private void readObject(ObjectInputStream stream)

0 commit comments

Comments
 (0)