Author: cziegeler
Date: Thu May 22 13:02:23 2014
New Revision: 1596851
URL: http://svn.apache.org/r1596851
Log:
SLING-2920 : Wrong handling of Sling Filter ordering. Apply patch from Felix
Meschberger, add test case and remove synced method calls for request handling
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java?rev=1596851&r1=1596850&r2=1596851&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java
Thu May 22 13:02:23 2014
@@ -51,33 +51,6 @@ public class SlingFilterChainHelper {
filters = this.getFilterArray();
return filter;
}
-/*
- public synchronized Filter[] removeAllFilters() {
- // will be returned after cleaning the lists
- Filter[] removedFilters = getFilters();
-
- filters = EMPTY_FILTER_ARRAY;
- filterList = null;
-
- return removedFilters;
- }
- public synchronized Filter removeFilter(Filter filter) {
- if (filterList != null) {
- filters = null;
- for (Iterator<FilterListEntry> fi = filterList.iterator();
fi.hasNext();) {
- FilterListEntry test = fi.next();
- if (test.getFilter().equals(filter)) {
- fi.remove();
- filters = this.getFilterArray();
- return test.getFilter();
- }
- }
- }
-
- // no removed filter
- return null;
- }
-*/
public synchronized boolean removeFilterById(final Object filterId) {
if (filterList != null) {
