Repository: oozie
Updated Branches:
  refs/heads/master 746be5c29 -> 65271d99b


OZIE-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/65271d99
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/65271d99
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/65271d99

Branch: refs/heads/master
Commit: 65271d99b08ca896a2dc3ea8b28a7281e8bd1940
Parents: 746be5c
Author: Bowen Zhang <[email protected]>
Authored: Wed Mar 4 13:40:43 2015 -0800
Committer: Bowen Zhang <[email protected]>
Committed: Wed Mar 4 13:41:12 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/65271d99/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 0851d1c..b1c109a 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 4.2.0 release (trunk - 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-2158 Overrides in action conf in streaming action do not work (rohini)
 OOZIE-2042 Max substitution for config variables should be configurable 
(seoeun25 via puru)
 OOZIE-1913 Devise a way to turn off SLA alerts for bundle/coordinator flexibly 
(puru)

http://git-wip-us.apache.org/repos/asf/oozie/blob/65271d99/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 17a064e..a639f4a 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
@@ -511,7 +511,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();

Reply via email to