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

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


The following commit(s) were added to refs/heads/master by this push:
     new 1858b4026 fix null pointer
1858b4026 is described below

commit 1858b4026c05dfa057b5bf475aa90175f85b83db
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Thu Dec 8 12:24:48 2022 +0300

    fix null pointer
---
 .../src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java 
b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
index 07330a825..f8411cf49 100644
--- 
a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
+++ 
b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
@@ -250,7 +250,9 @@ public class ClassGenerationAction {
             props.put(RuntimeConstants.RESOURCE_LOADERS, "cayenne");
             props.put("resource.loader.cayenne.class", 
ClassGeneratorResourceLoader.class.getName());
             props.put("resource.loader.cayenne.cache", "false");
-            props.put("resource.loader.cayenne.root", 
cgenConfiguration.getRootPath());
+            if(cgenConfiguration.getRootPath() != null) {
+                props.put("resource.loader.cayenne.root", 
cgenConfiguration.getRootPath());
+            }
         } else {
             props.put(RuntimeConstants.RESOURCE_LOADERS, "string");
             props.put("resource.loader.string.class", 
StringResourceLoader.class.getName());

Reply via email to