[FLINK-6610][web] Allow uploadDir to be null in WebFrontendBootstrap
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f72b8737 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f72b8737 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f72b8737 Branch: refs/heads/release-1.3 Commit: f72b8737912f5546aa97c3cfcde86d9d1aebc60e Parents: 95fce15 Author: zentol <[email protected]> Authored: Fri May 19 14:24:09 2017 +0200 Committer: zentol <[email protected]> Committed: Mon May 22 19:24:19 2017 +0200 ---------------------------------------------------------------------- .../org/apache/flink/runtime/webmonitor/HttpRequestHandler.java | 2 +- .../flink/runtime/webmonitor/utils/WebFrontendBootstrap.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/f72b8737/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java index d14b7a2..bde9976 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java @@ -126,7 +126,7 @@ public class HttpRequestHandler extends SimpleChannelInboundHandler<HttpObject> // IF SOMETHING EVER NEEDS POST PARAMETERS, THIS WILL BE THE PLACE TO HANDLE IT // all fields values will be passed with type Attribute. - if (data.getHttpDataType() == HttpDataType.FileUpload) { + if (data.getHttpDataType() == HttpDataType.FileUpload && tmpDir != null) { DiskFileUpload file = (DiskFileUpload) data; if (file.isCompleted()) { String name = file.getFilename(); http://git-wip-us.apache.org/repos/asf/flink/blob/f72b8737/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java index 19ec08a..3b3d6cb 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java @@ -62,7 +62,7 @@ public class WebFrontendBootstrap { final Configuration config) throws InterruptedException { this.router = Preconditions.checkNotNull(router); this.log = Preconditions.checkNotNull(log); - this.uploadDir = Preconditions.checkNotNull(directory); + this.uploadDir = directory; this.serverSSLContext = sslContext; ChannelInitializer<SocketChannel> initializer = new ChannelInitializer<SocketChannel>() {
