Do not remove calculated properties that are not found in the cache.

Sovles bug 2038
egonw · Jul 2, 2010 · f79125b · f79125b
1 parent 27ffc2a
commit f79125b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...pse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/business/SDFIndexEditorModel.java b/...pse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/business/SDFIndexEditorModel.java
@@ -149,8 +149,12 @@ public synchronized ICDKMolecule getMoleculeAt( int index ) {
                 }
             }
             for(IPropertyCalculator<?> calculator:calculators.values()) {
-                CDKMoleculeUtils.setProperty( mol, calculator.getPropertyName(),
-                         getPropertyFor( index, calculator.getPropertyName() ));
+                Object propertyValue = getPropertyFor( index,
+                                                 calculator.getPropertyName() );
+                if(propertyValue != null)
+                    CDKMoleculeUtils.setProperty( mol,
+                                                  calculator.getPropertyName(),
+                                                  propertyValue);
             }
         }
         return mol;