ScifioImgSource: close reader only in case of exception

dietzc · dietzc · commit f4200163f739 · 2017-04-08T17:12:59.000+02:00
diff --git a/org.knime.knip.io/src/org/knime/knip/io/ScifioImgSource.java b/org.knime.knip.io/src/org/knime/knip/io/ScifioImgSource.java
@@ -297,9 +297,10 @@ public ImgPlus<RealType> getImg(final String imgRef, final int currentSeries,
 					m_imgOpener.openImg(getReader(imgRef), getPixelType(imgRef, currentSeries), m_imgFactory, options));
 			org.apache.log4j.Logger.getLogger(KNIPLogService.class.getSimpleName()).setLevel(m_rootLvl);
 			return ret;
-		} finally {
+		} catch(Exception e) {
 			m_reader.closeNow();
 			m_reader = null;
+			throw e;
 		}
 
 	}

Original file line number	Diff line number	Diff line change
`@@ -297,9 +297,10 @@ public ImgPlus<RealType> getImg(final String imgRef, final int currentSeries,`
`297`	`297`	`m_imgOpener.openImg(getReader(imgRef), getPixelType(imgRef, currentSeries), m_imgFactory, options));`
`298`	`298`	`org.apache.log4j.Logger.getLogger(KNIPLogService.class.getSimpleName()).setLevel(m_rootLvl);`
`299`	`299`	`return ret;`
`300`		`- } finally {`
	`300`	`+ } catch(Exception e) {`
`301`	`301`	`m_reader.closeNow();`
`302`	`302`	`m_reader = null;`
	`303`	`+ throw e;`
`303`	`304`	`}`
`304`	`305`
`305`	`306`	`}`