[JENKINS-17013] NullPointerException when no "Default" GitTool instal…

…lation is set
jenkinsci · Mar 11, 2013 · d2e7c1f · d2e7c1f
1 parent d47ab3d
commit d2e7c1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -140,7 +140,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>git-client</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4-SNAPSHOT</version>
     </dependency>
 
     <dependency><!-- we contribute AbstractBuildParameters for Git if it's available -->

diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java
@@ -1875,13 +1875,12 @@ private boolean isRevExcluded(GitClient git, Revision r, TaskListener listener,
 
     @Initializer(after=PLUGINS_STARTED)
     public static void onLoaded() {
-        GitTool.DescriptorImpl gitTools = Jenkins.getInstance().getDescriptorByType(GitTool.DescriptorImpl.class);
         DescriptorImpl desc = Jenkins.getInstance().getDescriptorByType(DescriptorImpl.class);
 
         if (desc.getOldGitExe() != null) {
             String exe = desc.getOldGitExe();
-            GitTool tool = gitTools.getInstallation(GitTool.DEFAULT);
-            if (tool.getGitExe().equals(exe)) {
+            String defaultGit = GitTool.getDefaultInstallation().getGitExe();
+            if (defaultGit.equals(exe)) {
                 return;
             }
             System.err.println("[WARNING] you're using deprecated gitexe attribute to configure git plugin. Use Git installations");