Repository: oozie Updated Branches: refs/heads/branch-4.1 47e969c00 -> 1353e66fd
OOZIE-2147 Oozie upgrade from 4.0.0 to 4.1.0 fails with CLOBs of zero length with Oracle DB (venkatnrangan via bzhang) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/1353e66f Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/1353e66f Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/1353e66f Branch: refs/heads/branch-4.1 Commit: 1353e66fdd0e5f6bc4f78e7508c3ff49272f0c69 Parents: 47e969c Author: Bowen Zhang <[email protected]> Authored: Wed Mar 4 13:44:23 2015 -0800 Committer: Bowen Zhang <[email protected]> Committed: Wed Mar 4 13:44:23 2015 -0800 ---------------------------------------------------------------------- release-log.txt | 1 + tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/1353e66f/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index f4595f8..4497afc 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,4 +1,5 @@ -- Oozie 4.1.1 release (4.1 branch - unreleased) +OOZIE-2147 Oozie upgrade from 4.0.0 to 4.1.0 fails with CLOBs of zero length with Oracle DB (venkatnrangan via bzhang) OOZIE-2100 Publish oozie-webapp artifact (sureshms via bzhang) OOZIE-2098 Add Apache parent POM to oozie (sureshms via bzhang) -- Oozie 4.1.0 release http://git-wip-us.apache.org/repos/asf/oozie/blob/1353e66f/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java index 556cbe5..d14b2c6 100644 --- a/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java +++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java @@ -503,7 +503,7 @@ public class OozieDBCLI { while (rs.next()) { for (int i = 0; i < columnNames.size(); i++) { Clob srcClob = rs.getClob(columnNames.get(i)); - if (srcClob == null) { + if (srcClob == null || srcClob.length() < 1) { continue; } tempBlobCall.execute();
