Merge pull request jenkinsci#70 from navyasruti/master

DavidTanner · DavidTanner · commit f2cb99b77bea · 2015-01-06T21:02:45.000-07:00
small null reference fix in merge trigger after ghprb
diff --git a/src/main/java/org/jenkinsci/plugins/ghprb/Ghprb.java b/src/main/java/org/jenkinsci/plugins/ghprb/Ghprb.java
@@ -115,7 +115,7 @@ public boolean isOktotestPhrase(String comment) {
     }
 
     public boolean isTriggerPhrase(String comment) {
-        return !triggerPhrase.equals("") && comment.contains(triggerPhrase);
+        return !triggerPhrase.equals("") && comment != null && comment.contains(triggerPhrase);
     }
 
     public boolean ifOnlyTriggerPhrase() {

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public boolean isOktotestPhrase(String comment) {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`public boolean isTriggerPhrase(String comment) {`
`118`		`- return !triggerPhrase.equals("") && comment.contains(triggerPhrase);`
	`118`	`+ return !triggerPhrase.equals("") && comment != null && comment.contains(triggerPhrase);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`public boolean ifOnlyTriggerPhrase() {`