SLING-10021 cleanup
diff --git a/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java b/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
index d85b636..fa32047 100644
--- a/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
+++ b/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
@@ -80,8 +80,8 @@
statusMessage = statusToString(statusCode);
}
- //properly consider the 'Accept' header conditions to decide whether to send json or html back
- if (req instanceof HttpServletRequest &&
+ //properly consider the 'Accept' header conditions to decide whether to send json or html back
+ if (req instanceof HttpServletRequest &&
JSON_CONTENT_TYPE.equals(new MediaRangeList((HttpServletRequest)req).prefer(HTML_CONTENT_TYPE, JSON_CONTENT_TYPE))) {
renderJson(req, res, statusMessage, requestUri, servletName, statusCode);
} else {
@@ -145,12 +145,12 @@
// the error inline and warn about that
log.warn("Response already committed, unable to change status, output might not be well formed");
}
-
+
// send the error as JSON
try (JsonGenerator jsonGenerator = Json.createGenerator(res.getWriter())) {
jsonGenerator.writeStartObject();
jsonGenerator.write("status", statusCode);
-
+
String msg = (String)req.getAttribute(SlingConstants.ERROR_MESSAGE);
if (msg != null && !msg.isEmpty()) {
jsonGenerator.write("message", statusMessage);
@@ -159,7 +159,7 @@
if (requestUri != null && !requestUri.isEmpty()) {
jsonGenerator.write("requestUri", requestUri);
}
-
+
if (servletName != null && !servletName.isEmpty()) {
jsonGenerator.write("servletName", servletName);
}
diff --git a/src/test/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServletTest.java b/src/test/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServletTest.java
index ba54f8f..1ec9f7c 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServletTest.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServletTest.java
@@ -82,7 +82,7 @@
errorServlet.init(new MockServletConfig());
errorServlet.service(req, res);
- // verify we got json back
+ // verify we got html back
assertEquals("text/html", res.getContentType());
String responseOutput = res.getOutput().toString();
