From ad413c55e3e787aa9c2424d7232864c7b95ee86b Mon Sep 17 00:00:00 2001
From: Erik Ramfelt <eramfelt@gmail.com>
Date: Fri, 8 Jul 2011 20:52:29 +0200
Subject: [PATCH] [FIXED JENKINS-10182] Used Util.fixNull() to handle the case
 when a jobs description is null

---
 core/src/main/java/hudson/model/Job.java     |  3 ++-
 test/src/test/java/hudson/model/JobTest.java | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index cefcac4d5a..cad50aa557 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -27,6 +27,7 @@ import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import hudson.Extension;
 import hudson.ExtensionPoint;
 import hudson.PermalinkList;
+import hudson.Util;
 import hudson.cli.declarative.CLIResolver;
 import hudson.model.Descriptor.FormException;
 import hudson.model.Fingerprint.Range;
@@ -1002,7 +1003,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
         if (req.getMethod().equals("GET")) {
             //read
             rsp.setContentType("text/plain;charset=UTF-8");
-            rsp.getWriter().write(this.getDescription());
+            rsp.getWriter().write(Util.fixNull(this.getDescription()));
             return;
         }
         if (req.getMethod().equals("POST")) {
diff --git a/test/src/test/java/hudson/model/JobTest.java b/test/src/test/java/hudson/model/JobTest.java
index c249b78df0..e1e448ac17 100644
--- a/test/src/test/java/hudson/model/JobTest.java
+++ b/test/src/test/java/hudson/model/JobTest.java
@@ -26,6 +26,7 @@ package hudson.model;
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 import com.gargoylesoftware.htmlunit.WebAssert;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.TextPage;
 
 import hudson.util.TextFile;
 import java.io.IOException;
@@ -227,4 +228,15 @@ public class JobTest extends HudsonTestCase {
         assertEquals(2, r.getArtifactsUpTo(2).size());
         assertEquals(1, r.getArtifactsUpTo(1).size());
     }
+
+    @Bug(10182)
+    public void testEmptyDescriptionReturnsEmptyPage() throws Exception {
+        // A NPE was thrown if a job had a null (empty) description.
+        WebClient wc = createWebClient();
+        FreeStyleProject project = createFreeStyleProject("project");
+        project.setDescription("description");
+        assertEquals("description", ((TextPage) wc.goTo("job/project/description", "text/plain")).getContent());
+        project.setDescription(null);
+        assertEquals("", ((TextPage) wc.goTo("job/project/description", "text/plain")).getContent());
+    }
 }
-- 
GitLab