Merge pull request #911 from sagarbhavsar4328/myfirstbug

k8s-ci-robot · web-flow · commit 0a0e37c86283 · 2020-04-15T01:24:03.000-07:00
Issue:#845, added 'null' string check to allow to pass null values in…
diff --git a/util/src/main/java/io/kubernetes/client/util/Yaml.java b/util/src/main/java/io/kubernetes/client/util/Yaml.java
@@ -350,7 +350,11 @@ private byte[] constructByteArray(ScalarNode node) {
     }
 
     private Object constructDateTime(ScalarNode node) {
-      return new DateTime(((ScalarNode) node).getValue(), DateTimeZone.UTC);
+      if (node.getValue() == null || "null".equalsIgnoreCase(node.getValue())) {
+        return null;
+      } else {
+        return new DateTime(node.getValue(), DateTimeZone.UTC);
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,11 @@ private byte[] constructByteArray(ScalarNode node) {`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`private Object constructDateTime(ScalarNode node) {`
`353`		`- return new DateTime(((ScalarNode) node).getValue(), DateTimeZone.UTC);`
	`353`	`+ if (node.getValue() == null \|\| "null".equalsIgnoreCase(node.getValue())) {`
	`354`	`+ return null;`
	`355`	`+ } else {`
	`356`	`+ return new DateTime(node.getValue(), DateTimeZone.UTC);`
	`357`	`+ }`
`354`	`358`	`}`
`355`	`359`	`}`
`356`	`360`