merged back the RC branch

changelog.html

@@ -109,7 +109,10 @@ Upcoming changes</a>
 
 <!-- these changes are controlled by the release process. DO NOT MODIFY -->
 <div id="rc" style="display:none;"><!--=BEGIN=-->
-<h3><a name=v1.426>What's new in 1.426</a> <!--=DATE=--></h3>
+<h3><a name=v1.427>What's new in 1.427</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.426>What's new in 1.426</a> (2011/08/15)</h3>
 <ul class=image>
   <li class=bug>
     Auto Install JDK asks for Oracle account, but the link goes 404.
@@ -125,7 +128,6 @@ Upcoming changes</a>
     Fixed background of title image
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-9571">issue 9571</a>)
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.425>What's new in 1.425</a> (2011/08/08)</h3>
 <ul class=image>
   <li class=rfe>

core/src/main/java/hudson/model/Executor.java

@@ -122,12 +122,13 @@ public class Executor extends Thread implements ModelObject {
      */
     public void interrupt(Result result) {
         Authentication a = Jenkins.getAuthentication();
-        User u = User.current();
-        
-        if (a!=ACL.SYSTEM && u!=null)
-            interrupt(result, new UserInterruption(u));    // worth recording who did it
-        else
+        if(a instanceof AnonymousAuthenticationToken || a==ACL.SYSTEM)
             interrupt(result, new CauseOfInterruption[0]);
+        else {
+            // worth recording who did it
+            // avoid using User.get() to avoid deadlock.
+            interrupt(result, new UserInterruption(a.getName()));
+        }
     }
 
     /**

core/src/main/java/jenkins/model/CauseOfInterruption.java

@@ -74,6 +74,10 @@ public abstract class CauseOfInterruption {
             this.user = user.getId();
         }
 
+        public UserInterruption(String userId) {
+            this.user = userId;
+        }
+
         public User getUser() {
             return User.get(user);
         }

core/src/main/resources/lib/form/validateButton.jelly

@@ -48,7 +48,7 @@ THE SOFTWARE.
   </st:documentation>
   <f:entry>
     <div style="float:right">
-      <input type="button" value="${title}" class="yui-button" onclick="validateButton('${rootURL}${descriptor.descriptorFullUrl}/${method}','${with}',this)" />
+      <input type="button" value="${title}" class="yui-button" onclick="validateButton('${descriptor.descriptorFullUrl}/${method}','${with}',this)" />
     </div>
     <div style="display:none;">
       <img src="${imagesURL}/spinner.gif" /> ${attrs.progress}

debian/debian/changelog

+jenkins (1.426) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Mon, 15 Aug 2011 21:21:43 -0700
+
 jenkins (1.425) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.