[flink] 02/19: [hotfix] ignore empty yarn properties

[kkloudas]

This is an automated email from the ASF dual-hosted git repository.

kkloudas pushed a commit to branch executor-impl
in repository https://gitbox.apache.org/repos/asf/flink.git

commit accfbf59b0a843697b55cce290d221344ef6c94d
Author: Kostas Kloudas <kklou...@gmail.com>
AuthorDate: Sun Nov 17 16:50:18 2019 +0100

    [hotfix] ignore empty yarn properties
---
 .../src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java 
b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
index 3fb8dfa..362deda 100644
--- 
a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
+++ 
b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
@@ -416,7 +416,9 @@ public class FlinkYarnSessionCli extends 
AbstractCustomCommandLine {
                }
 
                final String dynamicPropertiesEncoded = 
encodeDynamicProperties(commandLine);
-               
configuration.setString(YarnConfigOptionsInternal.DYNAMIC_PROPERTIES, 
dynamicPropertiesEncoded);
+               if (dynamicPropertiesEncoded != null && 
!dynamicPropertiesEncoded.isEmpty()) {
+                       
configuration.setString(YarnConfigOptionsInternal.DYNAMIC_PROPERTIES, 
dynamicPropertiesEncoded);
+               }
 
                final boolean detached = 
commandLine.hasOption(YARN_DETACHED_OPTION.getOpt()) || 
commandLine.hasOption(DETACHED_OPTION.getOpt());
                configuration.setBoolean(DeploymentOptions.ATTACHED, !detached);