Skip to content

Commit 9c227b6

Browse files
committed
Merge branch 'null-properties-fix' into 'main'
Ensure values for Properties object are strings for 14.1.1+ See merge request weblogic-cloud/weblogic-deploy-tooling!1459
2 parents 53645a9 + e5b23ad commit 9c227b6

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

core/src/main/java/oracle/weblogic/deploy/aliases/TypeUtils.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
2+
* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
33
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
*/
55
package oracle.weblogic.deploy.aliases;
@@ -324,7 +324,9 @@ private static Properties convertToProperties(Object value, String delimiter) th
324324
@SuppressWarnings("unchecked")
325325
Map<Object,Object> propMap = (Map<Object,Object>) value;
326326
properties = new Properties();
327-
properties.putAll(propMap);
327+
for (Map.Entry<Object, Object> entry: propMap.entrySet()) {
328+
properties.setProperty(entry.getKey().toString(), getPropertyText(entry.getValue()));
329+
}
328330
} else if (PyDictionary.class.isAssignableFrom(value.getClass())) {
329331
PyDictionary dict = (PyDictionary) value;
330332
properties = new Properties();

0 commit comments

Comments
 (0)