diff options
Diffstat (limited to 'eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential')
2 files changed, 4 insertions, 4 deletions
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java index 7e66ca86..6c00fb2e 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java @@ -199,9 +199,9 @@ public class KeyStoreConfiguration { */ public static KeyStoreType fromString(final String s) { try { - return KeyStoreType.valueOf(s.toUpperCase()); + return s != null ? KeyStoreType.valueOf(s.toUpperCase()) : null; - } catch (IllegalArgumentException | NullPointerException e) { + } catch (IllegalArgumentException e) { return null; } } diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/SymmetricKeyConfiguration.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/SymmetricKeyConfiguration.java index 9477789c..96d46381 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/SymmetricKeyConfiguration.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/SymmetricKeyConfiguration.java @@ -185,9 +185,9 @@ public class SymmetricKeyConfiguration { */ public static SymmetricKeyType fromString(final String s) { try { - return SymmetricKeyType.valueOf(s.toUpperCase()); + return s != null ? SymmetricKeyType.valueOf(s.toUpperCase()) : null; - } catch (IllegalArgumentException | NullPointerException e) { + } catch (IllegalArgumentException e) { return null; } } |