0003293: Resource leak when loading data from transport

JumpMind · Oct 29, 2017 · e222aaf · e222aaf
1 parent 15611f9
commit e222aaf
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java
@@ -553,14 +553,18 @@ protected List<IncomingBatch> loadDataFromTransport(final ProcessInfo processInf
                 if (threadFactory == null) {
                     threadFactory = new CustomizableThreadFactory(parameterService.getEngineName().toLowerCase() + "-dataloader");
                 }
+
                 ExecutorService executor = Executors.newFixedThreadPool(1, threadFactory);
                 LoadIntoDatabaseOnArrivalListener loadListener = new LoadIntoDatabaseOnArrivalListener(processInfo,
                         sourceNode.getNodeId(), listener, executor);
-                new SimpleStagingDataWriter(transport.openReader(), stagingManager, Constants.STAGING_CATEGORY_INCOMING, 
-                        memoryThresholdInBytes, BatchType.LOAD, targetNodeId, ctx, loadListener).process();
 
-                /* Previously submitted tasks will still be executed */
-                executor.shutdown();
+                try {
+                    new SimpleStagingDataWriter(transport.openReader(), stagingManager, Constants.STAGING_CATEGORY_INCOMING,
+                            memoryThresholdInBytes, BatchType.LOAD, targetNodeId, ctx, loadListener).process();
+                } finally {
+                    /* Previously submitted tasks will still be executed */
+                    executor.shutdown();
+                }
 
                 OutputStreamWriter outWriter = null;
                 if (out != null) {