Resolve formula regressions in cdk-data. A new test was added to chec…

…k for NPEs when adding formula, only cdk-silent updated. Change-Id: I858ff5ddb64f44a1b9c99653b382ffdd3b47e307 Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
cdk · Nov 9, 2014 · 55c8bbe · 55c8bbe
1 parent 37bb41c
commit 55c8bbe
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/base/data/src/main/java/org/openscience/cdk/formula/MolecularFormula.java b/base/data/src/main/java/org/openscience/cdk/formula/MolecularFormula.java
@@ -91,7 +91,12 @@ public IMolecularFormula add(IMolecularFormula formula) {
         for (IIsotope newIsotope : formula.isotopes()) {
             addIsotope(newIsotope, formula.getIsotopeCount(newIsotope));
         }
-        if (formula.getCharge() != null) charge += formula.getCharge();
+        if (formula.getCharge() != null) {
+            if (charge != null)
+                charge += formula.getCharge();
+            else
+                charge = formula.getCharge();
+        }
         return this;
     }