[sling-org-apache-sling-servlets-resolver] branch master updated: SLING-10296 : Error Handler throws Error checking if response is Open

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new f6e542c  SLING-10296 : Error Handler throws Error checking if response 
is Open
f6e542c is described below

commit f6e542c1459cf8e9595732f84defc559ddd08516
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Fri Nov 19 10:07:47 2021 +0100

    SLING-10296 : Error Handler throws Error checking if response is Open
---
 .../HandleErrorSlingHttpServletResponse.java       |  2 +-
 .../HandleErrorSlingHttpServletResponseTest.java}  | 35 +++++-----------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/servlets/resolver/internal/HandleErrorSlingHttpServletResponse.java
 
b/src/main/java/org/apache/sling/servlets/resolver/internal/HandleErrorSlingHttpServletResponse.java
index c4c4b8f..1315845 100644
--- 
a/src/main/java/org/apache/sling/servlets/resolver/internal/HandleErrorSlingHttpServletResponse.java
+++ 
b/src/main/java/org/apache/sling/servlets/resolver/internal/HandleErrorSlingHttpServletResponse.java
@@ -48,7 +48,7 @@ final class HandleErrorSlingHttpServletResponse extends 
SlingHttpServletResponse
      * @return true of open, false otherwise
      */
     public boolean isOpen() {
-        return this.writer.isOpen();
+        return this.writer != null && this.writer.isOpen();
     }
 
 }
diff --git 
a/src/main/java/org/apache/sling/servlets/resolver/internal/HandleErrorSlingHttpServletResponse.java
 
b/src/test/java/org/apache/sling/servlets/resolver/internal/HandleErrorSlingHttpServletResponseTest.java
similarity index 51%
copy from 
src/main/java/org/apache/sling/servlets/resolver/internal/HandleErrorSlingHttpServletResponse.java
copy to 
src/test/java/org/apache/sling/servlets/resolver/internal/HandleErrorSlingHttpServletResponseTest.java
index c4c4b8f..ea4463f 100644
--- 
a/src/main/java/org/apache/sling/servlets/resolver/internal/HandleErrorSlingHttpServletResponse.java
+++ 
b/src/test/java/org/apache/sling/servlets/resolver/internal/HandleErrorSlingHttpServletResponseTest.java
@@ -18,37 +18,18 @@
  */
 package org.apache.sling.servlets.resolver.internal;
 
-import java.io.IOException;
-import java.io.PrintWriter;
+import static org.junit.Assert.assertFalse;
 
 import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
+import org.junit.Test;
+import org.mockito.Mockito;
 
-/**
- * wrap the original response so we can monitor if the writer
- * has been closed
- */
-final class HandleErrorSlingHttpServletResponse extends 
SlingHttpServletResponseWrapper {
-    private HandleErrorResponseWriter writer = null;
+public class HandleErrorSlingHttpServletResponseTest {
 
-    HandleErrorSlingHttpServletResponse(SlingHttpServletResponse response) {
-        super(response);
-    }
+    @Test public void testIsClosed() {
+        final SlingHttpServletResponse orig = 
Mockito.mock(SlingHttpServletResponse.class);
 
-    @Override
-    public PrintWriter getWriter() throws IOException {
-        if (this.writer == null) {
-            this.writer = new 
HandleErrorResponseWriter(getResponse().getWriter());
-        }
-        return this.writer;
+        final HandleErrorSlingHttpServletResponse resp = new 
HandleErrorSlingHttpServletResponse(orig);
+        assertFalse(resp.isOpen());
     }
-
-    /**
-     * Returns whether the response writer is open
-     * @return true of open, false otherwise
-     */
-    public boolean isOpen() {
-        return this.writer.isOpen();
-    }
-
 }