selecting error from sys.jobs_log caused

a NPE in some rare cases
crate · Jun 24, 2015 · 60d02ca · 60d02ca
1 parent 383d390
commit 60d02ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,8 @@ Changes for Crate
 Unreleased
 ==========
 
+ - Fix: selecting error from sys.jobs_log caused a NPE in some cases
+
  - Fix: If a query would fail because a shard starts to relocate during
    query time, the query is retried now
 

diff --git a/sql/src/main/java/io/crate/operation/reference/sys/job/SysJobLogExpression.java b/sql/src/main/java/io/crate/operation/reference/sys/job/SysJobLogExpression.java
@@ -64,10 +64,11 @@ public Long value() {
             .add(new SysJobLogExpression<BytesRef>(ERROR) {
                 @Override
                 public BytesRef value() {
-                    if (row.errorMessage() == null) {
+                    String err = row.errorMessage();
+                    if (err == null) {
                         return null;
                     }
-                    return new BytesRef(row.errorMessage());
+                    return new BytesRef(err);
                 }
             })
             .build();