Merge pull request hudson2-plugins#35 from vjuranek/JENKINS-9843

abayer · abayer · commit b3ea09ea4d25 · 2011-07-15T11:52:33.000-07:00
[FIXED JENKINS-9843] Fixed NPE
diff --git a/src/main/java/hudson/plugins/git/opt/PreBuildMergeOptions.java b/src/main/java/hudson/plugins/git/opt/PreBuildMergeOptions.java
@@ -45,7 +45,7 @@ public void setMergeTarget(String mergeTarget) {
 
     @Exported
     public String getRemoteBranchName() {
-        return mergeRemote.getName() + "/" + mergeTarget;
+        return (mergeRemote == null) ? null : mergeRemote.getName() + "/" + mergeTarget;
     }
 
     public boolean doMerge() {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void setMergeTarget(String mergeTarget) {`
`45`	`45`
`46`	`46`	`@Exported`
`47`	`47`	`public String getRemoteBranchName() {`
`48`		`- return mergeRemote.getName() + "/" + mergeTarget;`
	`48`	`+ return (mergeRemote == null) ? null : mergeRemote.getName() + "/" + mergeTarget;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public boolean doMerge() {`