From commits-return-9488-apmail-kafka-commits-archive=kafka.apache.org@kafka.apache.org Wed May 9 17:48:20 2018 Return-Path: X-Original-To: apmail-kafka-commits-archive@www.apache.org Delivered-To: apmail-kafka-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9098D182B6 for ; Wed, 9 May 2018 17:48:20 +0000 (UTC) Received: (qmail 40717 invoked by uid 500); 9 May 2018 17:48:20 -0000 Delivered-To: apmail-kafka-commits-archive@kafka.apache.org Received: (qmail 40676 invoked by uid 500); 9 May 2018 17:48:20 -0000 Mailing-List: contact commits-help@kafka.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kafka.apache.org Delivered-To: mailing list commits@kafka.apache.org Received: (qmail 40667 invoked by uid 99); 9 May 2018 17:48:20 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 May 2018 17:48:20 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id CD68E8528E; Wed, 9 May 2018 17:48:19 +0000 (UTC) Date: Wed, 09 May 2018 17:48:19 +0000 To: "commits@kafka.apache.org" Subject: [kafka] branch 1.1 updated: KAFKA-6878: NPE when querying global state store not in READY state (#4978) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152588809909.22296.10887532919713231342@gitbox.apache.org> From: guozhang@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: kafka X-Git-Refname: refs/heads/1.1 X-Git-Reftype: branch X-Git-Oldrev: 80396dab05754be30cb9681671e65c479a4005af X-Git-Newrev: fbfaa0f35f3b672b21e56190cbf9fa8d375e5989 X-Git-Rev: fbfaa0f35f3b672b21e56190cbf9fa8d375e5989 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. guozhang pushed a commit to branch 1.1 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/1.1 by this push: new fbfaa0f KAFKA-6878: NPE when querying global state store not in READY state (#4978) fbfaa0f is described below commit fbfaa0f35f3b672b21e56190cbf9fa8d375e5989 Author: tedyu AuthorDate: Wed May 9 10:42:10 2018 -0700 KAFKA-6878: NPE when querying global state store not in READY state (#4978) Check whether cache is null before retrieving from cache. Reviewers: Guozhang Wang , Bill Bejeck --- .../apache/kafka/streams/state/internals/CachingKeyValueStore.java | 5 ++++- .../org/apache/kafka/streams/state/internals/CachingWindowStore.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java index 82a6ac7..9eebc16 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java @@ -163,7 +163,10 @@ class CachingKeyValueStore extends WrappedStateStore.AbstractStateStore im } private byte[] getInternal(final Bytes key) { - final LRUCacheEntry entry = cache.get(cacheName, key); + LRUCacheEntry entry = null; + if (cache != null) { + entry = cache.get(cacheName, key); + } if (entry == null) { final byte[] rawValue = underlying.get(key); if (rawValue == null) { diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java index ad0bd99..7109af0 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java @@ -1,3 +1,4 @@ + /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with -- To stop receiving notification emails like this one, please contact guozhang@apache.org.