[JENKINS-15369] NPE from Jenkins.removeNode continued.

/computer/*/doDelete should try harder to remove even a “zombie” Computer with no associated Node.
jenkinsci · Oct 12, 2012 · 87d9a6e · 87d9a6e
1 parent a1cef72
commit 87d9a6e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/changelog.html b/changelog.html
@@ -59,6 +59,9 @@
     Using the bottom-sticking "OK" button in more places
   <li class=rfe>
     Slave logs are put into sub-directories to avoid cluttering $JENKINS_HOME
+  <li class=bug>
+    <code>/computer/*/doDelete</code> should try harder to remove even “zombie” <code>Computer</code>s.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15369">issue 15369</a>)
   <li class=rfe>
     Added "manage old data" permanently to the "manage Jenkins" page.
   <li class=rfe>

diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
@@ -1176,10 +1176,12 @@ private void replaceBy(Node newNode) throws ServletException, IOException {
     public HttpResponse doDoDelete() throws IOException {
         checkPermission(DELETE);
         Node node = getNode();
-        if (node == null) {
-            throw new IOException("Cannot delete " + nodeName + " since it does not still exist");
+        if (node != null) {
+            Jenkins.getInstance().removeNode(node);
+        } else {
+            AbstractCIBase app = Jenkins.getInstance();
+            app.removeComputer(this);
         }
-        Jenkins.getInstance().removeNode(node);
         return new HttpRedirect("..");
     }