From d870a3726dfd303c96b3b82b18e9201c7087c970 Mon Sep 17 00:00:00 2001 From: Raphael Girardot <raphael.girardot@synchrotron-soleil.fr> Date: Fri, 3 Mar 2017 09:00:46 +0000 Subject: [PATCH] NullPointerException avoided --- .../bensikin/options/ReadWriteOptionBook.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/fr/soleil/bensikin/options/ReadWriteOptionBook.java b/src/main/java/fr/soleil/bensikin/options/ReadWriteOptionBook.java index b8e8f34..49fcf0c 100644 --- a/src/main/java/fr/soleil/bensikin/options/ReadWriteOptionBook.java +++ b/src/main/java/fr/soleil/bensikin/options/ReadWriteOptionBook.java @@ -1,4 +1,4 @@ -//+====================================================================== +// +====================================================================== // $Source: /cvsroot/tango-cs/tango/tools/bensikin/bensikin/options/ReadWriteOptionBook.java,v $ // // Project: Tango Archiving Service @@ -147,11 +147,14 @@ public class ReadWriteOptionBook { * Map of size 2. */ public void build(Collection<Map<String, String>> options) { - for (Map<String, String> nextOption : options) { - String nextName = nextOption.get(ReadWriteOptionBook.NAME_TAG); - String nextValue = nextOption.get(ReadWriteOptionBook.VALUE_TAG); - this.putOption(nextName, nextValue); + if (options != null) { + for (Map<String, String> nextOption : options) { + String nextName = nextOption.get(ReadWriteOptionBook.NAME_TAG); + String nextValue = nextOption.get(ReadWriteOptionBook.VALUE_TAG); + if ((nextName != null) && (nextValue != null)) { + putOption(nextName, nextValue); + } + } } - } } -- GitLab