You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/05/19 04:56:24 UTC
[karaf] branch master updated: [KARAF-6270] Using default value in
ClientConfig when using invalid value
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new eed6da1 [KARAF-6270] Using default value in ClientConfig when using invalid value
new 3fca012 Merge pull request #844 from jbonofre/KARAF-6270
eed6da1 is described below
commit eed6da120afd1f39916c62ed2f4e7d0ed9fd9fb1
Author: Jean-Baptiste Onofré <jb...@apache.org>
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;