[sling-org-apache-sling-engine] branch master updated (82d2b42 -> 1b08136)

[pa...@apache.org]

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

pauls pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git.


    from 82d2b42  SLING-8416 - Improve test coverage for ServletFilterManager
     new 9d0cc37  Add missing license header.
     new 1b08136  SLING-8469: use resetBuffer instead of reset in SlingRequestDispatcher.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../engine/impl/request/SlingRequestDispatcher.java  |  4 ++--
 .../engine/impl/filter/ServletFilterManagerTest.java | 20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

[sling-org-apache-sling-engine] 02/02: SLING-8469: use resetBuffer instead of reset in SlingRequestDispatcher.

[pa...@apache.org]

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

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

commit 1b08136dcfac79c3d86a7a6f9a6a692acc575596
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Tue Jun 4 11:24:57 2019 +0200

    SLING-8469: use resetBuffer instead of reset in SlingRequestDispatcher.
---
 .../org/apache/sling/engine/impl/request/SlingRequestDispatcher.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/engine/impl/request/SlingRequestDispatcher.java b/src/main/java/org/apache/sling/engine/impl/request/SlingRequestDispatcher.java
index cd1b4a4..9f7924e 100644
--- a/src/main/java/org/apache/sling/engine/impl/request/SlingRequestDispatcher.java
+++ b/src/main/java/org/apache/sling/engine/impl/request/SlingRequestDispatcher.java
@@ -130,7 +130,7 @@ public class SlingRequestDispatcher implements RequestDispatcher {
         // reset the response, will throw an IllegalStateException
         // if already committed, which will not be the case because
         // we already tested for this condition
-        response.reset();
+        response.resetBuffer();
 
         // ensure inclusion information attributes are not set
         request.removeAttribute(SlingConstants.ATTR_REQUEST_CONTENT);
@@ -278,4 +278,4 @@ public class SlingRequestDispatcher implements RequestDispatcher {
         }
 
     }
-}
\ No newline at end of file
+}

[sling-org-apache-sling-engine] 01/02: Add missing license header.

[pa...@apache.org]

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

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

commit 9d0cc37171914cbed75fb20784468bdfafb21bc9
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Tue Jun 4 11:24:03 2019 +0200

    Add missing license header.
---
 .../engine/impl/filter/ServletFilterManagerTest.java | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/apache/sling/engine/impl/filter/ServletFilterManagerTest.java b/src/test/java/org/apache/sling/engine/impl/filter/ServletFilterManagerTest.java
index 7274d2f..60f7b68 100644
--- a/src/test/java/org/apache/sling/engine/impl/filter/ServletFilterManagerTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/filter/ServletFilterManagerTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.sling.engine.impl.filter;
 
 import org.apache.commons.lang3.ArrayUtils;
@@ -120,4 +138,4 @@ public class ServletFilterManagerTest {
 
         }
     }
-}
\ No newline at end of file
+}