From 7478e7a55aeabb73a8b162011b55cd977ccf9142 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 7 Jun 2011 15:17:47 -0700
Subject: [PATCH] removed StaplerRequest/Response dependencies

---
 core/src/main/java/jenkins/model/Jenkins.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 10337fb4b7..7e5bd44ce5 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -2988,16 +2988,11 @@ public class Jenkins extends AbstractCIBase implements ItemGroup<TopLevelItem>,
      * Shutdown the system safely.
      * @since 1.332
      */
-    public void doSafeExit( StaplerRequest req, StaplerResponse rsp ) throws IOException {
+    public HttpResponse doSafeExit(StaplerRequest req) throws IOException {
         checkPermission(ADMINISTER);
-        rsp.setStatus(HttpServletResponse.SC_OK);
-        rsp.setContentType("text/plain");
-        PrintWriter w = rsp.getWriter();
-        w.println("Shutting down as soon as all jobs are complete");
-        w.close();
         isQuietingDown = true;
         final String exitUser = getAuthentication().getName();
-        final String exitAddr = req.getRemoteAddr().toString();
+        final String exitAddr = req!=null ? req.getRemoteAddr() : "unknown";
         new Thread("safe-exit thread") {
             @Override
             public void run() {
@@ -3020,6 +3015,8 @@ public class Jenkins extends AbstractCIBase implements ItemGroup<TopLevelItem>,
                 }
             }
         }.start();
+
+        return HttpResponses.plainText("Shutting down as soon as all jobs are complete");
     }
 
     /**
-- 
GitLab