Merge branch 'develop' into feature/#92-FIX-Tomcat8-Unable_to_derive_…

…image_dimensions
SCADA-LTS · Sep 10, 2018 · 1242f7e · 1242f7e
2 parents ba32e61 + 1bd82d3
commit 1242f7e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/com/serotonin/mango/rt/dataImage/types/BinaryValue.java b/src/com/serotonin/mango/rt/dataImage/types/BinaryValue.java
@@ -28,13 +28,13 @@ public class BinaryValue extends MangoValue implements Comparable<BinaryValue> {
     public static final BinaryValue ONE = new BinaryValue(true);
 
     public static BinaryValue parseBinary(String s) {
+        if(s==null) return ZERO;
         s = s.trim().toLowerCase();
-        if(s == null || s.equals("0") || s.equals("false")) {
-            return ZERO;
-        } else if(s.equals("1") || s.equals("true")) {
+        if(s.equals("1") || s.equals("true")) {
             return ONE;
+        } else {
+            return ZERO;
         }
-        throw new NumberFormatException("Value is not a binary.");
     }
 
     private final boolean value;