[Cdk-commits] CVS: cdk/src/org/openscience/cdk/io ChemFileCDO.java,1.15,1.16

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/io
In directory sc8-pr-cvs1:/tmp/cvs-serv25509/src/org/openscience/cdk/io

Modified Files:
	ChemFileCDO.java 
Log Message:
Don't crash on bad input, just give an error and fail silently

Index: ChemFileCDO.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/io/ChemFileCDO.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChemFileCDO.java	15 Apr 2003 12:15:11 -0000	1.15
+++ ChemFileCDO.java	10 May 2003 15:29:27 -0000	1.16
@@ -5,7 +5,7 @@
  * 
  * Copyright (C) 1997-2003  The Chemistry Development Kit (CDK) project
  * 
- * Contact: ste...@ic..., gez...@ma..., eg...@sc...
+ * Contact: cdk...@li...
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -240,6 +240,20 @@
       logger.debug("objectType: " + objectType);
       logger.debug("propType: " + propertyType);
       logger.debug("property: " + propertyValue);
+      
+      if (objectType == null) {
+          logger.error("Cannot add property for null object");
+          return;
+      }
+      if (propertyType == null) {
+          logger.error("Cannot add property for null property type");
+          return;
+      }
+      if (propertyValue == null) {
+          logger.error("Cannot add null property");
+          return;
+      }
+      
       if (objectType.equals("Molecule")) {
         if (propertyType.equals("id")) {
           currentMolecule.setID(propertyValue);