GG-11860 Implement snapshot status on platform level -fix tests with node filters
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0384b662 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0384b662 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0384b662 Branch: refs/heads/ignite-gg-8.0.3.ea6-clients-test Commit: 0384b66252d331f8a0406eecbaeec5ba6f12ed2c Parents: 4f85917 Author: EdShangGG <[email protected]> Authored: Fri Feb 17 20:10:50 2017 +0300 Committer: EdShangGG <[email protected]> Committed: Fri Feb 17 20:10:50 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/pagemem/snapshot/SnapshotOperation.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0384b662/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/SnapshotOperation.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/SnapshotOperation.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/SnapshotOperation.java index 221d0ce..3e13f95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/SnapshotOperation.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/SnapshotOperation.java @@ -98,7 +98,6 @@ public class SnapshotOperation implements Serializable { return extraParam; } - /** {@inheritDoc} */ @Override public boolean equals(Object o) { if (this == o) return true; @@ -111,19 +110,15 @@ public class SnapshotOperation implements Serializable { return false; if (type != operation.type) return false; - if (cacheNames != null ? !cacheNames.equals(operation.cacheNames) : operation.cacheNames != null) - return false; if (msg != null ? !msg.equals(operation.msg) : operation.msg != null) return false; return extraParam != null ? extraParam.equals(operation.extraParam) : operation.extraParam == null; } - /** {@inheritDoc} */ @Override public int hashCode() { - int result = type != null ? type.hashCode() : 0; + int result = type.hashCode(); result = 31 * result + (int)(snapshotId ^ (snapshotId >>> 32)); - result = 31 * result + (cacheNames != null ? cacheNames.hashCode() : 0); result = 31 * result + (msg != null ? msg.hashCode() : 0); result = 31 * result + (extraParam != null ? extraParam.hashCode() : 0); return result;
