Added check if results not equal size as request

bioclipse · Jul 12, 2012 · c64015d · c64015d
1 parent 87ca409
commit c64015d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...ins/net.bioclipse.chemspider/src/net/bioclipse/chemspider/business/ChemspiderManager.java b/...ins/net.bioclipse.chemspider/src/net/bioclipse/chemspider/business/ChemspiderManager.java
@@ -312,6 +312,11 @@ private List<ICDKMolecule> getMoleculesWithExtendedInfo(int[] results, IProgress
 		} catch (RemoteException e1) {
 			e1.printStackTrace();
 		}
+
+		if (info.length!=results.length){
+			logger.warn("Chemspider results and extendedinfo do not have same " +
+					"size: info=" + info.length + " and results=" + results.length);
+		}
 
 		for (int i = 0; i< results.length; i++){
 			int crid = results[i];
@@ -325,7 +330,7 @@ private List<ICDKMolecule> getMoleculesWithExtendedInfo(int[] results, IProgress
 				//Set properties on mol from Chemspider info
 				ICDKMolecule cdkmol = cdk.asCDKMolecule(csmol);
 
-				if (info!=null && info[i]!=null){
+				if (info!=null && i<info.length && info[i]!=null){
 					cdkmol.setProperty("chemspider.commonname", info[i].getCommonName());
 					cdkmol.setProperty("chemspider.inchi", info[i].getInChI());
 					cdkmol.setProperty("chemspider.inchikey", info[i].getInChIKey());