From 94ae08701bbd7585a0b7e5a92d1975965a503c03 Mon Sep 17 00:00:00 2001
From: Dennis Kao <ulysseskao@gmail.com>
Date: Wed, 15 Jan 2014 11:28:52 +0800
Subject: [PATCH] Merge branch 'origin/2.1.x'
---
xdgnjobs/ximple-elmparser/src/main/java/com/ximple/eofms/XElementFetcher.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/xdgnjobs/ximple-elmparser/src/main/java/com/ximple/eofms/XElementFetcher.java b/xdgnjobs/ximple-elmparser/src/main/java/com/ximple/eofms/XElementFetcher.java
index f9f9cc7..e1024b5 100644
--- a/xdgnjobs/ximple-elmparser/src/main/java/com/ximple/eofms/XElementFetcher.java
+++ b/xdgnjobs/ximple-elmparser/src/main/java/com/ximple/eofms/XElementFetcher.java
@@ -337,7 +337,7 @@
elmLogger.flashLogging();
}
- protected static byte[] getBytesFromBLOB(BLOB blob) throws SQLException
+ protected byte[] getBytesFromBLOB(BLOB blob) throws SQLException
{
byte[] raw = null;
@@ -363,8 +363,6 @@
buffer.put(chunk);
}
- is.close();
-
assert buffer != null;
buffer.position(0);
raw = buffer.array();
@@ -372,6 +370,9 @@
{
e.printStackTrace(); // To change body of catch statement use File | Settings | File Templates.
Assert.shouldNeverReachHere();
+ } finally
+ {
+ try { is.close(); } catch (IOException e) { logger.warn("InputStream cannot close", e); };
}
return raw;
@@ -457,7 +458,7 @@
BLOB blob = (BLOB) rsSrc.getBlob(1);
raw = getBytesFromBLOB(blob);
- blob.close();
+ // blob.close();
} else
{
raw = rsSrc.getBytes(1);
--
Gitblit v0.0.0-SNAPSHOT