This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 7ddb6c45fa Avoid NPE on null value in list/map/property.
new 9aa35b283a Merge pull request #5868 from
sdedic/gradle/container-null-value
7ddb6c45fa is described below
commit 7ddb6c45fa0a3ae253023f1d1f47cef946c0ef3f
Author: Svata Dedic <svatopluk.de...@oracle.com>
AuthorDate: Fri Apr 21 16:41:41 2023 +0200
Avoid NPE on null value in list/map/property.
---
.../gradle/tooling/NbProjectInfoBuilder.java | 32 ++++++++++++++++------
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index bbf2118203..126ed14e36 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -733,8 +733,12 @@ class NbProjectInfoBuilder {
String k = it.getKey();
String newPrefix = prefix + "." + k + "."; // NOI18N
Object v = it.getValue();
- defaultValues.put(prefix + "." + k, Objects.toString(v)); // NOI18N
- inspectObjectAndValues(v.getClass(), v, newPrefix, globalTypes,
propertyTypes, defaultValues, null, false);
+ if (v == null) {
+ defaultValues.put(prefix + "." + k, null); // NOI18N
+ } else {
+ defaultValues.put(prefix + "." + k, Objects.toString(v)); //
NOI18N
+ inspectObjectAndValues(v.getClass(), v, newPrefix,
globalTypes, propertyTypes, defaultValues, null, false);
+ }
}
}
@@ -766,8 +770,12 @@ class NbProjectInfoBuilder {
for (String k : m.keySet()) {
newPrefix = prefix + "." + k + "."; // NOI18N
Object v = m.get(k);
- defaultValues.put(prefix + "." + k, Objects.toString(v)); //
NOI18N
- inspectObjectAndValues(v.getClass(), v, newPrefix,
globalTypes, propertyTypes, defaultValues, null, false);
+ if (v == null) {
+ defaultValues.put(prefix + "." + k, null); // NOI18N
+ } else {
+ defaultValues.put(prefix + "." + k, Objects.toString(v));
// NOI18N
+ inspectObjectAndValues(v.getClass(), v, newPrefix,
globalTypes, propertyTypes, defaultValues, null, false);
+ }
}
dumped = true;
} else if (Iterable.class.isAssignableFrom(t)) {
@@ -794,8 +802,12 @@ class NbProjectInfoBuilder {
try {
for (Object o : (Iterable)value) {
String newPrefix = prefix + "[" + index + "]."; //
NOI18N
- defaultValues.put(prefix + "[" + index + "]",
Objects.toString(o)); //NOI18N
- inspectObjectAndValues(o.getClass(), o, newPrefix,
globalTypes, propertyTypes, defaultValues, null, false);
+ if (o == null) {
+ defaultValues.put(prefix + "[" + index + "]",
null); //NOI18N
+ } else {
+ defaultValues.put(prefix + "[" + index + "]",
Objects.toString(o)); //NOI18N
+ inspectObjectAndValues(o.getClass(), o, newPrefix,
globalTypes, propertyTypes, defaultValues, null, false);
+ }
index++;
}
} catch (RuntimeException ex) {
@@ -838,8 +850,12 @@ class NbProjectInfoBuilder {
String k = o.toString();
String newPrefix = prefix + "[" + k + "]"; // NOI18N
Object v = mvalue.get(o);
- defaultValues.put(newPrefix, Objects.toString(v)); //
NOI18N
- inspectObjectAndValues(v.getClass(), v, newPrefix + ".",
globalTypes, propertyTypes, defaultValues, null, itemClass == null);
+ if (v == null) {
+ defaultValues.put(newPrefix, null); // NOI18N
+ } else {
+ defaultValues.put(newPrefix, Objects.toString(v)); //
NOI18N
+ inspectObjectAndValues(v.getClass(), v, newPrefix +
".", globalTypes, propertyTypes, defaultValues, null, itemClass == null);
+ }
}
dumped = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
