| commit | 95910dda4a0c124d840290a3f5ac6fd163404eb5 | [log] [tgz] |
|---|---|---|
| author | Carsten Ziegeler <cziegeler@apache.org> | Fri May 22 08:18:34 2015 +0000 |
| committer | Carsten Ziegeler <cziegeler@apache.org> | Fri May 22 08:18:34 2015 +0000 |
| tree | f9fa1343a6ae4fc9b3dd8f2097ec088df3e992b0 | |
| parent | 5e36e92d4cb8f5cc9574363c77467d6ddb406b7f [diff] |
FELIX-4860 : Revisit HandlerRegistry implementation. Improve error page registration. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1681033 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/FilterRegistry.java b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/FilterRegistry.java index 560c0b1..81acbae6 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/FilterRegistry.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/FilterRegistry.java
@@ -141,7 +141,7 @@ while ( i.hasNext() ) { final FilterRegistrationStatus status = i.next(); - if ( status.getHandler().getFilterInfo().compareTo(filterInfo) == 0 ) + if ( status.getHandler().getFilterInfo().equals(filterInfo) ) { found = status; i.remove();
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java index b92a798..ec9d4bc 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
@@ -431,7 +431,7 @@ while ( i.hasNext() ) { final ContextHandler handler = i.next(); - if ( handler.getContextInfo().compareTo(info) == 0 ) + if ( handler.getContextInfo().equals(info) ) { i.remove(); // check for deactivate