Merge branch 'origin/2.1.x'

Dennis Kao

2014-01-15 94ae08701bbd7585a0b7e5a92d1975965a503c03

 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);