Merge pull request #11 from ssogabe/JENKINS-12487

[FIXED JENKINS-12487] Global configuration not saved since Jenkins 1.445
jenkinsci · Feb 5, 2012 · 64482a8 · 64482a8
2 parents fba1b1a + 685f5b6
commit 64482a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
-		<version>1.424</version>
+		<version>1.445</version>
 	</parent>
 
 	<groupId>com.coravy.hudson.plugins.github</groupId>

diff --git a/src/main/java/com/cloudbees/jenkins/GitHubPushTrigger.java b/src/main/java/com/cloudbees/jenkins/GitHubPushTrigger.java
@@ -239,13 +239,13 @@ public List<Credential> getCredentials() {
         public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
             JSONObject hookMode = json.getJSONObject("hookMode");
             manageHook = "auto".equals(hookMode.getString("value"));
-            JSONObject o = json.getJSONObject("hookUrl");
+            JSONObject o = hookMode.getJSONObject("hookUrl");
             if (o!=null && !o.isNullObject()) {
                 hookUrl = o.getString("url");
             } else {
                 hookUrl = null;
             }
-            credentials = req.bindJSONToList(Credential.class,json.get("credentials"));
+            credentials = req.bindJSONToList(Credential.class,hookMode.get("credentials"));
             save();
             return true;
         }