From c4fc931e75f36ba4c8d915bd010188d496294614 Mon Sep 17 00:00:00 2001
From: jurgen <serge-rider@users.noreply.github.com>
Date: Tue, 23 Jun 2015 22:17:48 +0000
Subject: [PATCH] BLOB export fix

Former-commit-id: ca91a49c62d627a760122184c4e74e159b0feaa2
---
 .../stream/StreamTransferConsumer.java        | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java
index 91830a86fc..9403b7f6ba 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java
@@ -435,30 +435,34 @@ public class StreamTransferConsumer implements IDataTransferConsumer<StreamConsu
         @Override
         public void writeBinaryData(InputStream stream, long streamLength) throws IOException
         {
-            exportSite.flush();
-            switch (settings.getLobEncoding()) {
-                case BASE64:
-                {
-                    Base64.encode(stream, streamLength, writer);
-                    break;
-                }
-                case HEX:
-                {
-                    writer.write("0x"); //$NON-NLS-1$
-                    byte[] buffer = new byte[5000];
-                    for (;;) {
-                        int count = stream.read(buffer);
-                        if (count <= 0) {
-                            break;
+            try {
+                exportSite.flush();
+                switch (settings.getLobEncoding()) {
+                    case BASE64:
+                    {
+                        Base64.encode(stream, streamLength, writer);
+                        break;
+                    }
+                    case HEX:
+                    {
+                        writer.write("0x"); //$NON-NLS-1$
+                        byte[] buffer = new byte[5000];
+                        for (;;) {
+                            int count = stream.read(buffer);
+                            if (count <= 0) {
+                                break;
+                            }
+                            GeneralUtils.writeBytesAsHex(writer, buffer, 0, count);
                         }
-                        GeneralUtils.writeBytesAsHex(writer, buffer, 0, count);
+                        break;
                     }
-                    break;
+                    default:
+                        // Binary stream
+                        IOUtils.copyStream(stream, outputStream, 5000);
+                        break;
                 }
-                default:
-                    // Binary stream
-                    IOUtils.copyStream(stream, outputStream, 5000);
-                    break;
+            } finally {
+                ContentUtils.close(stream);
             }
         }
     }
-- 
GitLab