Merge pull request #2395 from joshmoore/12233-close-importproc

Close ImportProcessPrx instances (Fix #12233)
ome · May 1, 2014 · 0532e07 · 0532e07
2 parents a0985cf + 77e45c0
commit 0532e07
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/components/blitz/src/ome/formats/importer/ImportLibrary.java b/components/blitz/src/ome/formats/importer/ImportLibrary.java
@@ -476,6 +476,14 @@ public List<Pixels> importImage(final ImportContainer container, int index,
             failingChecksums = cve.failingChecksums;
             throw cve;
         } finally {
+
+            try {
+                proc.close();
+            } catch (Exception e) {
+                log.warn("Exception while closing proc", e);
+            }
+
+
             notifyObservers(new ImportEvent.FILESET_UPLOAD_END(
                     null, index, srcFiles.length, null, null, srcFiles,
                     checksums, failingChecksums, null));

diff --git a/components/insight/SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java b/components/insight/SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java
@@ -6365,6 +6365,11 @@ Object importImageFile(SecurityContext ctx, ImportableObject object,
 	            failingChecksums = cve.failingChecksums;
 	            return new ImportException(cve);
 	        } finally {
+	            try {
+	                proc.close();
+	            } catch (Exception e) {
+	                dsFactory.getLogger().error(this, "Cannot close import process.");
+	            }
 	            library.notifyObservers(new ImportEvent.FILESET_UPLOAD_END(
 	                    null, 0, srcFiles.length, null, null, srcFiles,
 	                    checksums, failingChecksums, null));