From commits-return-117509-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Thu Apr 5 14:28:02 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 3044D18063B for ; Thu, 5 Apr 2018 14:28:02 +0200 (CEST) Received: (qmail 49154 invoked by uid 500); 5 Apr 2018 12:28:00 -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 49145 invoked by uid 99); 5 Apr 2018 12:28:00 -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; Thu, 05 Apr 2018 12:28:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C99AF6A12; Thu, 5 Apr 2018 12:27:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Message-Id: <3e13959f7724428fa4ddee2848c0d3da@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-8147: SQL: fixed NPE during DELETE statement execution. Date: Thu, 5 Apr 2018 12:27:59 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/master 54096d7c6 -> 1dded3ae8 IGNITE-8147: SQL: fixed NPE during DELETE statement execution. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1dded3ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1dded3ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1dded3ae Branch: refs/heads/master Commit: 1dded3ae8fe21bc25f09d597b808ce409271cd42 Parents: 54096d7 Author: devozerov Authored: Thu Apr 5 15:27:44 2018 +0300 Committer: devozerov Committed: Thu Apr 5 15:27:44 2018 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheContext.java | 4 ++++ .../ignite/internal/processors/cache/GridCacheMapEntry.java | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1dded3ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 9eb4340..f194423 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -1841,6 +1841,10 @@ public class GridCacheContext implements Externalizable { * @throws IgniteCheckedException, If validation fails. */ public void validateKeyAndValue(KeyCacheObject key, CacheObject val) throws IgniteCheckedException { + // No validation for removal. + if (val == null) + return; + if (!isQueryEnabled()) return; http://git-wip-us.apache.org/repos/asf/ignite/blob/1dded3ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index bc0e954..74dabe9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -1489,8 +1489,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme updated = cctx.toCacheObject(updated0); - if (updated != null) // no validation for remove case - cctx.validateKeyAndValue(key, updated); + cctx.validateKeyAndValue(key, updated); } else updated = old;