From 3746ace76a21d94e46f1cdd031d4e62d0364f5d3 Mon Sep 17 00:00:00 2001 From: Nishith Agarwal Date: Tue, 21 Aug 2018 17:27:56 -0700 Subject: [PATCH] Fixing Null pointer exception in finally block --- .../java/com/uber/hoodie/table/HoodieMergeOnReadTable.java | 4 +++- .../uber/hoodie/common/table/log/HoodieLogFormatWriter.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hoodie-client/src/main/java/com/uber/hoodie/table/HoodieMergeOnReadTable.java b/hoodie-client/src/main/java/com/uber/hoodie/table/HoodieMergeOnReadTable.java index 3ead5904c..078d23ad0 100644 --- a/hoodie-client/src/main/java/com/uber/hoodie/table/HoodieMergeOnReadTable.java +++ b/hoodie-client/src/main/java/com/uber/hoodie/table/HoodieMergeOnReadTable.java @@ -296,7 +296,9 @@ public class HoodieMergeOnReadTable extends "Failed to rollback for commit " + commit, io); } finally { try { - writer.close(); + if (writer != null) { + writer.close(); + } } catch (IOException io) { throw new UncheckedIOException(io); } diff --git a/hoodie-common/src/main/java/com/uber/hoodie/common/table/log/HoodieLogFormatWriter.java b/hoodie-common/src/main/java/com/uber/hoodie/common/table/log/HoodieLogFormatWriter.java index e0644d69f..c75e666bd 100644 --- a/hoodie-common/src/main/java/com/uber/hoodie/common/table/log/HoodieLogFormatWriter.java +++ b/hoodie-common/src/main/java/com/uber/hoodie/common/table/log/HoodieLogFormatWriter.java @@ -72,6 +72,7 @@ public class HoodieLogFormatWriter implements HoodieLogFormat.Writer { try { this.output = fs.append(path, bufferSize); } catch (RemoteException e) { + log.warn("Remote Exception, attempting to handle or recover lease", e); handleAppendExceptionOrRecoverLease(path, e); } catch (IOException ioe) { if (ioe.getMessage().equalsIgnoreCase("Not supported")) {