#2102 PropertiesDefaultProvider at first try to load properties from …

…classpath - check if commandSpec.userObject is null
remkop · Sep 18, 2023 · b4434f4 · b4434f4
1 parent a6c207f
commit b4434f4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
@@ -18979,7 +18979,11 @@ private static Properties loadProperties(CommandSpec commandSpec) {
                 if (file.canRead()) {
                     return createProperties(file, commandSpec);
                 } else {
-                    URL resource = commandSpec.userObject().getClass().getClassLoader().getResource(propertiesFileName);
+                    Object userObject = commandSpec.userObject();
+                    if (userObject == null) {
+                        userObject = commandSpec.commandLine;
+                    }
+                    URL resource = userObject.getClass().getClassLoader().getResource(propertiesFileName);
                     Tracer tracer = CommandLine.tracer();
                     if (resource != null) {
                         file = new File(resource.getFile());