From 20b069a146ecfcb096890813a20f4f9df9853372 Mon Sep 17 00:00:00 2001
From: Marcel Hellkamp <marc@gsites.de>
Date: Wed, 26 Feb 2014 19:09:05 +0100
Subject: [PATCH] fix #848: ServerResource throws away response entities

Do not replace existing and available but empty response entities with `null`.
---
 .../org.restlet/src/org/restlet/resource/ServerResource.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/org.restlet/src/org/restlet/resource/ServerResource.java b/modules/org.restlet/src/org/restlet/resource/ServerResource.java
index 0624ebfb62..3fe6060de0 100644
--- a/modules/org.restlet/src/org/restlet/resource/ServerResource.java
+++ b/modules/org.restlet/src/org/restlet/resource/ServerResource.java
@@ -1018,7 +1018,7 @@ public Representation handle() {
                     result = doHandle();
                 }
 
-                if (!getResponse().isEntityAvailable()) {
+                if (result != null && !getResponse().isEntityAvailable()) {
                     // If the user manually set the entity, keep it
                     getResponse().setEntity(result);
                 }