Blame SOURCES/maven-invoker-MSHARED-278.patch

a7d31b
From fb1bfb61d31abcdfaac0256648f42257520ce3c9 Mon Sep 17 00:00:00 2001
a7d31b
From: Mikolaj Izdebski <mizdebsk@redhat.com>
a7d31b
Date: Wed, 13 Mar 2013 13:35:39 +0100
a7d31b
Subject: [PATCH 1/2] Fix MSHARED-278
a7d31b
a7d31b
See: http://jira.codehaus.org/browse/MSHARED-278
a7d31b
---
a7d31b
 .../java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java   | 2 +-
a7d31b
 1 file changed, 1 insertion(+), 1 deletion(-)
a7d31b
a7d31b
diff --git a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
a7d31b
index f8a22a5..35ab16b 100644
a7d31b
--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
a7d31b
+++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
a7d31b
@@ -542,7 +542,7 @@ public class MavenCommandLineBuilder
a7d31b
                 if ( !mavenHome.isDirectory() )
a7d31b
                 {
a7d31b
                     File binDir = mavenHome.getParentFile();
a7d31b
-                    if ( "bin".equals( binDir.getName() ) )
a7d31b
+                    if ( binDir != null && "bin".equals( binDir.getName() ) )
a7d31b
                     {
a7d31b
                         // ah, they specified the mvn
a7d31b
                         // executable instead...
a7d31b
-- 
a7d31b
1.8.1.4
a7d31b