Added nullcheck

dutoitc · Oct 12, 2017 · 550f2ac · 550f2ac
1 parent 189b133
commit 550f2ac
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/main/java/ch/mno/copper/collect/WebCollector.java b/src/main/java/ch/mno/copper/collect/WebCollector.java
@@ -60,6 +60,7 @@ public static List<String> query(String url, String username, String password, L
             results = extractValues(data, valuesKept);
         } catch (Exception e) {
             System.err.println("Connector exception (server " + url+ "): " + e.getMessage());
+            e.printStackTrace();
             if (results==null) {
                 results = new ArrayList<>(valuesKept.size());
             }
@@ -100,7 +101,9 @@ else if ("contentType".equals(key)) {
                             results.add(res.get(0).toString());
                         }
                     } else if (o instanceof String) {
-                        results.add((String)o);
+                        results.add((String) o);
+                    } else if (o==null) {
+                        results.add("null");
                     } else {
                         results.add(o.toString());
                     }
@@ -113,12 +116,5 @@ else if ("contentType".equals(key)) {
         return results;
     }
 
-    public static void main(String[] args) {
-        List<Pair<String, String>> values = new ArrayList<>();
-        values.add(new ImmutablePair<>("responseCode", "rs"));
-        values.add(new ImmutablePair<>("status", "s"));
-        WebCollector.query("http://tom.etat-de-vaud.ch:1530/ws/infra/status", null, null, values);
-    }
-
 }