Fix NPE from getDirectory() by using known root directory.

mathieucarbou · Jan 17, 2022 · b420ffc · b420ffc
1 parent 226fec2
commit b420ffc
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/license-maven-plugin-git/src/main/java/com/mycila/maven/plugin/license/git/GitLookup.java b/license-maven-plugin-git/src/main/java/com/mycila/maven/plugin/license/git/GitLookup.java
@@ -59,6 +59,7 @@ public enum DateSource {
   private final GitPathResolver pathResolver;
   private final Repository repository;
   private final TimeZone timeZone;
+  private final boolean shallow;
 
   /**
    * Creates a new {@link GitLookup} for a repository that is detected from the supplied {@code anyFile}.
@@ -78,7 +79,8 @@ public GitLookup(File anyFile, DateSource dateSource, TimeZone timeZone, int che
     /* A workaround for  https://bugs.eclipse.org/bugs/show_bug.cgi?id=457961 */
     this.repository.getObjectDatabase().newReader().getShallowCommits();
 
-    this.pathResolver = new GitPathResolver(repository.getWorkTree().getAbsolutePath());
+    String rootDir = repository.getWorkTree().getAbsolutePath();
+    this.pathResolver = new GitPathResolver(rootDir);
     this.dateSource = dateSource;
     switch (dateSource) {
       case COMMITER:
@@ -95,6 +97,7 @@ public GitLookup(File anyFile, DateSource dateSource, TimeZone timeZone, int che
         throw new IllegalStateException("Unexpected " + DateSource.class.getName() + " " + dateSource);
     }
     this.checkCommitsCount = checkCommitsCount;
+    this.shallow = new File(rootDir + File.separatorChar + ".git" + File.separatorChar + "shallow").exists();
   }
 
   /**
@@ -186,9 +189,7 @@ String getAuthorEmailOfCreation(File file) throws IOException, GitAPIException {
   }
 
   boolean isShallowRepository() {
-    File dotGit = repository.getDirectory();
-    File shallow = new File(dotGit.getPath() + File.separator + "shallow");
-    return shallow.exists();
+    return this.shallow;
   }
 
   private boolean isFileModifiedOrUnstaged(String repoRelativePath) throws GitAPIException {