[maven] branch master updated: Fix possible NPE

[gnodet]

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

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new 26ee15a47 Fix possible NPE
26ee15a47 is described below

commit 26ee15a47e625dc402c65bf05a7bab15aa686b28
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed May 31 15:52:05 2023 +0200

    Fix possible NPE
---
 .../org/apache/maven/model/building/DefaultModelBuilder.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index c630c0c61..0289b3081 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1033,11 +1033,13 @@ public class DefaultModelBuilder implements 
ModelBuilder {
 
             if (source != null) {
                 try {
-                    org.apache.maven.api.model.InputSource v4src =
-                            model.getLocation("").getSource();
-                    Field field = 
InputSource.class.getDeclaredField("modelId");
-                    field.setAccessible(true);
-                    field.set(v4src, ModelProblemUtils.toId(model));
+                    org.apache.maven.api.model.InputLocation loc = 
model.getLocation("");
+                    org.apache.maven.api.model.InputSource v4src = loc != null 
? loc.getSource() : null;
+                    if (v4src != null) {
+                        Field field = 
InputSource.class.getDeclaredField("modelId");
+                        field.setAccessible(true);
+                        field.set(v4src, ModelProblemUtils.toId(model));
+                    }
                 } catch (Throwable t) {
                     // TODO: use a lazy source ?
                     throw new IllegalStateException("Unable to set modelId on 
InputSource", t);