Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EEDBE200CBB for ; Tue, 20 Jun 2017 08:00:09 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EE80A160BE4; Tue, 20 Jun 2017 06:00:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EF46C160BE1 for ; Tue, 20 Jun 2017 08:00:07 +0200 (CEST) Received: (qmail 66759 invoked by uid 500); 20 Jun 2017 06:00:07 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 65427 invoked by uid 99); 20 Jun 2017 06:00:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jun 2017 06:00:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 31883F4B60; Tue, 20 Jun 2017 06:00:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Tue, 20 Jun 2017 06:00:33 -0000 Message-Id: <75b38043d5774e51b151bf6c658af08c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [31/50] ignite git commit: Fixed NPE inf GridCacheInternalKeyImpl. archived-at: Tue, 20 Jun 2017 06:00:10 -0000 Fixed NPE inf GridCacheInternalKeyImpl. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b172b4b2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b172b4b2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b172b4b2 Branch: refs/heads/ignite-2.1.2-exchange Commit: b172b4b27b07d09e726faf0a3e41747d6158cdc8 Parents: 52626df Author: devozerov Authored: Sat Jun 17 17:31:35 2017 +0300 Committer: devozerov Committed: Sat Jun 17 17:31:35 2017 +0300 ---------------------------------------------------------------------- .../datastructures/GridCacheInternalKeyImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b172b4b2/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java index eaabef7..5cd3d85 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java @@ -74,14 +74,24 @@ public class GridCacheInternalKeyImpl implements GridCacheInternalKey, Externali /** {@inheritDoc} */ @Override public int hashCode() { int result = name != null ? name.hashCode() : 0; + result = 31 * result + (grpName != null ? grpName.hashCode() : 0); + return result; } /** {@inheritDoc} */ @Override public boolean equals(Object obj) { - return this == obj || (obj instanceof GridCacheInternalKey && name.equals(((GridCacheInternalKey)obj).name()) - && grpName.equals(((GridCacheInternalKey)obj).groupName())); + if (this == obj) + return true; + + if (obj instanceof GridCacheInternalKeyImpl) { + GridCacheInternalKeyImpl other = (GridCacheInternalKeyImpl)obj; + + return F.eq(name, other.name) && F.eq(grpName, other.grpName); + } + + return false; } /** {@inheritDoc} */