This is an automated email from the ASF dual-hosted git repository.
kmarton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git
The following commit(s) were added to refs/heads/master by this push:
new 7e12bbc OOZIE-3466 Migrate from com.google.common.io.Closeables to
org.apache.commons.io.IOUtils (asalamon74 via kmarton)
7e12bbc is described below
commit 7e12bbc8b854c0648eb34a2830954462bd3cbcc5
Author: Julia Kinga Marton <[email protected]>
AuthorDate: Tue Apr 9 12:06:10 2019 +0200
OOZIE-3466 Migrate from com.google.common.io.Closeables to
org.apache.commons.io.IOUtils (asalamon74 via kmarton)
---
.../main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java | 5 ++---
release-log.txt | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
index e70e90b..df3fbb2 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
@@ -22,7 +22,6 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-import com.google.common.io.Closeables;
import com.google.common.primitives.Ints;
import java.io.File;
@@ -1134,7 +1133,7 @@ public class JavaActionExecutor extends ActionExecutor {
}
finally {
if (yarnClient != null) {
- Closeables.closeQuietly(yarnClient);
+ IOUtils.closeQuietly(yarnClient);
}
}
}
@@ -1919,7 +1918,7 @@ public class JavaActionExecutor extends ActionExecutor {
try {
FileSystem actionFs = context.getAppFileSystem();
cleanUpActionDir(actionFs, context);
- Closeables.closeQuietly(yarnClient);
+ IOUtils.closeQuietly(yarnClient);
} catch (Exception ex) {
LOG.error("Error when cleaning up action dir", ex);
throw convertException(ex);
diff --git a/release-log.txt b/release-log.txt
index bbde580..1a42b66 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-3466 Migrate from com.google.common.io.Closeables to
org.apache.commons.io.IOUtils (asalamon74 via kmarton)
OOZIE-3249 [tools] Instrumentation log parser (andras.piros via asalamon74)
OOZIE-3460 Remove pom files from Oozie sharelibs (nobigo via asalamon74)
OOZIE-3450 Investigate and clean git sharelib (matijhs via asalamon74)
