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 35F80200B8C for ; Mon, 12 Sep 2016 16:12:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 34766160AB8; Mon, 12 Sep 2016 14:12:15 +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 78FD4160AB3 for ; Mon, 12 Sep 2016 16:12:14 +0200 (CEST) Received: (qmail 65750 invoked by uid 500); 12 Sep 2016 14:12:13 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 65738 invoked by uid 99); 12 Sep 2016 14:12:13 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Sep 2016 14:12:13 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id E98F51A0117 for ; Mon, 12 Sep 2016 14:12:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.626 X-Spam-Level: X-Spam-Status: No, score=-4.626 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id Ua_10j8c7mFR for ; Mon, 12 Sep 2016 14:12:11 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 369FF5FABF for ; Mon, 12 Sep 2016 14:12:11 +0000 (UTC) Received: (qmail 65703 invoked by uid 99); 12 Sep 2016 14:12:10 -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; Mon, 12 Sep 2016 14:12:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 461CFDFD4C; Mon, 12 Sep 2016 14:12:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: abaker@apache.org To: commits@geode.incubator.apache.org Message-Id: <1b30a2673f554c9d996475575528e8a0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: GEODE-1809: Fix NPE in GemFireVersion Date: Mon, 12 Sep 2016 14:12:10 +0000 (UTC) archived-at: Mon, 12 Sep 2016 14:12:15 -0000 Repository: incubator-geode Updated Branches: refs/heads/develop e4a09a6a7 -> 71c863b5c GEODE-1809: Fix NPE in GemFireVersion Add a unit test to validate behavior when properties file is not present. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/71c863b5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/71c863b5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/71c863b5 Branch: refs/heads/develop Commit: 71c863b5c6ffda7fc212a13b05ff3c47b6e13d3f Parents: e4a09a6 Author: Anthony Baker Authored: Wed Sep 7 11:48:34 2016 -0700 Committer: Anthony Baker Committed: Mon Sep 12 07:11:40 2016 -0700 ---------------------------------------------------------------------- .../com/gemstone/gemfire/internal/GemFireVersion.java | 2 +- .../gemfire/internal/GemFireVersionJUnitTest.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71c863b5/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java index d8fa21b..73c36c5 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java @@ -207,7 +207,7 @@ public class GemFireVersion { } public String getProperty(String key) { - return error.orElse(description.getProperty(key)); + return error.orElseGet(() -> description.getProperty(key)); } public String getNativeCodeVersion() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71c863b5/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionJUnitTest.java index 850172a..44df2ca 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionJUnitTest.java @@ -17,6 +17,7 @@ package com.gemstone.gemfire.internal; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; import java.io.PrintWriter; import java.io.StringWriter; @@ -64,4 +65,13 @@ public class GemFireVersionJUnitTest { String noFileOutput = sw.toString(); assertTrue(noFileOutput.contains(LocalizedStrings.GemFireVersion_COULD_NOT_FIND_RESOURCE_COM_GEMSTONE_GEMFIRE_INTERNAL_0.toLocalizedString(noFile))); } + + @Test + public void testNoFileGetProperty() { + String noFile = "not a property file"; + VersionDescription noVersion = new VersionDescription(noFile); + + String err = LocalizedStrings.GemFireVersion_COULD_NOT_FIND_RESOURCE_COM_GEMSTONE_GEMFIRE_INTERNAL_0.toLocalizedString(noFile); + assertEquals(err, noVersion.getProperty(VersionDescription.GEMFIRE_VERSION)); + } }