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/03/23 11:40:18 UTC
[5/9] flink git commit: [hotfix] Make RestServerEndpoint#uploadDir
protected
[hotfix] Make RestServerEndpoint#uploadDir protected
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5f72ca57
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5f72ca57
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5f72ca57
Branch: refs/heads/release-1.5
Commit: 5f72ca57d817fbd77e8621cab3e21e1e57c34708
Parents: 23b44f8
Author: Till Rohrmann <tr...@apache.org>
Authored: Wed Mar 21 21:08:13 2018 +0100
Committer: Till Rohrmann <tr...@apache.org>
Committed: Fri Mar 23 12:39:30 2018 +0100
----------------------------------------------------------------------
.../apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java | 4 ----
.../java/org/apache/flink/runtime/rest/RestServerEndpoint.java | 3 ++-
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/5f72ca57/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java
index 4518552..8072cf4 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java
@@ -42,7 +42,6 @@ import org.apache.flink.util.FlinkException;
import org.apache.flink.shaded.netty4.io.netty.channel.ChannelInboundHandler;
import java.io.IOException;
-import java.nio.file.Path;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
@@ -52,8 +51,6 @@ import java.util.concurrent.Executor;
*/
public class DispatcherRestEndpoint extends WebMonitorEndpoint<DispatcherGateway> {
- private final Path uploadDir;
-
private WebMonitorExtension webSubmissionExtension;
public DispatcherRestEndpoint(
@@ -80,7 +77,6 @@ public class DispatcherRestEndpoint extends WebMonitorEndpoint<DispatcherGateway
leaderElectionService,
fatalErrorHandler);
- uploadDir = endpointConfiguration.getUploadDir();
webSubmissionExtension = WebMonitorExtension.empty();
}
http://git-wip-us.apache.org/repos/asf/flink/blob/5f72ca57/flink-runtime/src/main/java/org/apache/flink/runtime/rest/RestServerEndpoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/RestServerEndpoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/RestServerEndpoint.java
index dfb01ca..80d9140 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/RestServerEndpoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/RestServerEndpoint.java
@@ -77,8 +77,9 @@ public abstract class RestServerEndpoint {
private final String restBindAddress;
private final int restBindPort;
private final SSLEngine sslEngine;
- private final Path uploadDir;
private final int maxContentLength;
+
+ protected final Path uploadDir;
protected final Map<String, String> responseHeaders;
private final CompletableFuture<Void> terminationFuture;