From commits-return-36361-archive-asf-public=cust-asf.ponee.io@karaf.apache.org Sun May 19 04:57:01 2019 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 [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 26E8F18064C for ; Sun, 19 May 2019 06:57:01 +0200 (CEST) Received: (qmail 30137 invoked by uid 500); 19 May 2019 04:57:00 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 30128 invoked by uid 99); 19 May 2019 04:57:00 -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; Sun, 19 May 2019 04:57:00 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 46C0D85CED; Sun, 19 May 2019 04:57:00 +0000 (UTC) Date: Sun, 19 May 2019 04:57:00 +0000 To: "commits@karaf.apache.org" Subject: [karaf] branch karaf-4.2.x updated: [KARAF-6270] Using default value in ClientConfig when using invalid value MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155824182017.27575.2417057142125903403@gitbox.apache.org> From: jbonofre@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: karaf X-Git-Refname: refs/heads/karaf-4.2.x X-Git-Reftype: branch X-Git-Oldrev: 574b36cc87874c2dcbf0385dd01832eebaf774c3 X-Git-Newrev: bfeedc28d2aedc3beb4bdb0a51c9842b405f36e0 X-Git-Rev: bfeedc28d2aedc3beb4bdb0a51c9842b405f36e0 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. jbonofre pushed a commit to branch karaf-4.2.x in repository https://gitbox.apache.org/repos/asf/karaf.git The following commit(s) were added to refs/heads/karaf-4.2.x by this push: new bfeedc2 [KARAF-6270] Using default value in ClientConfig when using invalid value bfeedc2 is described below commit bfeedc28d2aedc3beb4bdb0a51c9842b405f36e0 Author: Jean-Baptiste Onofré AuthorDate: Sat May 18 07:56:59 2019 +0200 [KARAF-6270] Using default value in ClientConfig when using invalid value --- .../main/java/org/apache/karaf/client/ClientConfig.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/org/apache/karaf/client/ClientConfig.java b/client/src/main/java/org/apache/karaf/client/ClientConfig.java index ab2b402..8f57481 100644 --- a/client/src/main/java/org/apache/karaf/client/ClientConfig.java +++ b/client/src/main/java/org/apache/karaf/client/ClientConfig.java @@ -235,7 +235,12 @@ public class ClientConfig { if (val instanceof Number) { return ((Number) val).intValue(); } else if (val != null) { - return Integer.parseInt(val.toString()); + try { + return Integer.parseInt(val.toString()); + } catch (Exception e) { + System.err.println("Invalid value for " + key + ", using default " + def); + return def; + } } } return def; @@ -247,7 +252,12 @@ public class ClientConfig { if (val instanceof Number) { return ((Number) val).longValue(); } else if (val != null) { - return Long.parseLong(val.toString()); + try { + return Long.parseLong(val.toString()); + } catch (Exception e) { + System.err.println("Invalid value for " + key + ", using default " + def); + return def; + } } } return def;