You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/09/28 16:41:24 UTC
[flink] branch master updated: [FLINK-10065]
InstantiationUtil.deserializeObject(InputStream in, ClassLoader cl,
boolean isFailureTolerant) will close the inputStream (#6498)
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new c17c871 [FLINK-10065] InstantiationUtil.deserializeObject(InputStream in, ClassLoader cl, boolean isFailureTolerant) will close the inputStream (#6498)
c17c871 is described below
commit c17c87147dae4487c873702e0a2cb2f94ee25ec6
Author: Congxian Qiu <qc...@gmail.com>
AuthorDate: Sat Sep 29 00:40:40 2018 +0800
[FLINK-10065] InstantiationUtil.deserializeObject(InputStream in, ClassLoader cl, boolean isFailureTolerant) will close the inputStream (#6498)
* fix inputstream auto closable
* delete useless file
---
.../src/main/java/org/apache/flink/util/InstantiationUtil.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/flink-core/src/main/java/org/apache/flink/util/InstantiationUtil.java b/flink-core/src/main/java/org/apache/flink/util/InstantiationUtil.java
index a36560e..29885be 100644
--- a/flink-core/src/main/java/org/apache/flink/util/InstantiationUtil.java
+++ b/flink-core/src/main/java/org/apache/flink/util/InstantiationUtil.java
@@ -514,9 +514,10 @@ public final class InstantiationUtil {
final ClassLoader old = Thread.currentThread().getContextClassLoader();
// not using resource try to avoid AutoClosable's close() on the given stream
- try (ObjectInputStream oois = isFailureTolerant
+ try {
+ ObjectInputStream oois = isFailureTolerant
? new InstantiationUtil.FailureTolerantObjectInputStream(in, cl)
- : new InstantiationUtil.ClassLoaderObjectInputStream(in, cl)) {
+ : new InstantiationUtil.ClassLoaderObjectInputStream(in, cl);
Thread.currentThread().setContextClassLoader(cl);
return (T) oois.readObject();
}