You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by sm...@apache.org on 2015/04/13 23:19:08 UTC

drill git commit: DRILL-2758: Fix writer cleanup

Repository: drill
Updated Branches:
  refs/heads/master ba12f3d80 -> cc752c1a9


DRILL-2758: Fix writer cleanup


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/cc752c1a
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/cc752c1a
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/cc752c1a

Branch: refs/heads/master
Commit: cc752c1a93750482f0a9f1abf13a2ea6ea2f53af
Parents: ba12f3d
Author: Steven Phillips <sp...@maprtech.com>
Authored: Mon Mar 16 22:03:57 2015 -0700
Committer: Steven Phillips <sm...@apache.org>
Committed: Mon Apr 13 12:01:23 2015 -0700

----------------------------------------------------------------------
 .../org/apache/drill/exec/physical/impl/WriterRecordBatch.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/cc752c1a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/WriterRecordBatch.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/WriterRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/WriterRecordBatch.java
index 3d0a183..b419f71 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/WriterRecordBatch.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/WriterRecordBatch.java
@@ -180,8 +180,6 @@ public class WriterRecordBatch extends AbstractRecordBatch<Writer> {
 
   @Override
   public void cleanup() {
-    super.cleanup();
-    incoming.cleanup();
     try {
       if (recordWriter != null) {
         recordWriter.cleanup();
@@ -190,6 +188,8 @@ public class WriterRecordBatch extends AbstractRecordBatch<Writer> {
       logger.error("Failure while closing record writer", ex);
       throw new RuntimeException("Failed to close RecordWriter", ex);
     }
+    super.cleanup();
+    incoming.cleanup();
   }
 
 }