From 551fbf1152d6a6869a15786efc049cc8678966cf Mon Sep 17 00:00:00 2001 From: Egon Willighagen Date: Thu, 20 May 2010 16:27:32 +0200 Subject: [PATCH] Fixed stupid code: completeReturn() does not return in the method :( Thanx to Ola for spotting it --- .../src/net/bioclipse/inchi/business/InChIManager.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/net.bioclipse.inchi/src/net/bioclipse/inchi/business/InChIManager.java b/plugins/net.bioclipse.inchi/src/net/bioclipse/inchi/business/InChIManager.java index d171152dd..e5c231731 100644 --- a/plugins/net.bioclipse.inchi/src/net/bioclipse/inchi/business/InChIManager.java +++ b/plugins/net.bioclipse.inchi/src/net/bioclipse/inchi/business/InChIManager.java @@ -49,7 +49,10 @@ public void generate( IMolecule molecule, throws Exception { monitor.beginTask("Calculating InChI", IProgressMonitor.UNKNOWN); // return early if InChI library could not be loaded - if (!isAvailable()) returner.completeReturn(InChI.FAILED_TO_CALCULATE); + if (!isAvailable()) { + returner.completeReturn(InChI.FAILED_TO_CALCULATE); + return; + } Object adapted = molecule.getAdapter(IAtomContainer.class); if (adapted != null) { @@ -60,10 +63,6 @@ public void generate( IMolecule molecule, atom.setFlag(CDKConstants.ISAROMATIC, false); for (IBond bond : clone.bonds()) bond.setFlag(CDKConstants.ISAROMATIC, false); - // FIXME: this should already have been covered by the earlier - // isAvailable() call, but wasn't... weird... - if (factory == null) - returner.completeReturn(InChI.FAILED_TO_CALCULATE); InChIGenerator gen = factory.getInChIGenerator(clone); INCHI_RET status = gen.getReturnStatus(); if(monitor.isCanceled())