flink-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tzulitai <...@git.apache.org>
Subject [GitHub] flink pull request #4328: [FLINK-6493] Fix ineffective null check in Registe...
Date Thu, 03 Aug 2017 10:33:37 GMT
Github user tzulitai commented on a diff in the pull request:

    https://github.com/apache/flink/pull/4328#discussion_r131107598
  
    --- Diff: flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredOperatorBackendStateMetaInfo.java
---
    @@ -175,14 +176,19 @@ public boolean equals(Object obj) {
     				return false;
     			}
     
    +			if (!(obj instanceof Snapshot)) {
    +				return false;
    +			}
    +
    +			Snapshot snapshot = (Snapshot)obj;
    +
     			// need to check for nulls because serializer and config snapshots may be null on
restore
    -			return (obj instanceof Snapshot)
    -				&& name.equals(((Snapshot) obj).getName())
    -				&& assignmentMode.equals(((Snapshot) obj).getAssignmentMode())
    -				&& ((partitionStateSerializer == null && ((Snapshot) obj).getPartitionStateSerializer()
== null)
    -					|| partitionStateSerializer.equals(((Snapshot) obj).getPartitionStateSerializer()))
    -				&& ((partitionStateSerializerConfigSnapshot == null && ((Snapshot)
obj).getPartitionStateSerializerConfigSnapshot() == null)
    -					|| partitionStateSerializerConfigSnapshot.equals(((Snapshot) obj).getPartitionStateSerializerConfigSnapshot()));
    +			return Objects.equals(name, snapshot.getName())
    +				&& Objects.equals(assignmentMode, snapshot.getAssignmentMode())
    +				&& ((partitionStateSerializer == null && (snapshot.getPartitionStateSerializer()
== null)
    +					|| (Objects.equals(partitionStateSerializer, snapshot.getPartitionStateSerializer())))
    +				&& ((partitionStateSerializerConfigSnapshot == null && (snapshot.getPartitionStateSerializerConfigSnapshot()
== null)
    +					|| (Objects.equals(partitionStateSerializerConfigSnapshot, snapshot.getPartitionStateSerializerConfigSnapshot())))));
    --- End diff --
    
    Same for these two.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message