Author: cziegeler
Date: Mon Apr 22 08:03:50 2013
New Revision: 1470406
URL: http://svn.apache.org/r1470406
Log:
SLING-2836 : Missing @(De)Activate annotations in ReferrerFilter#(de)activate()
methods cause Sling Referrer Filter Tab clones
Modified:
sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ReferrerFilter.java
Modified:
sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ReferrerFilter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ReferrerFilter.java?rev=1470406&r1=1470405&r2=1470406&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ReferrerFilter.java
(original)
+++
sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ReferrerFilter.java
Mon Apr 22 08:03:50 2013
@@ -42,7 +42,9 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.PropertyUnbounded;
import org.apache.felix.scr.annotations.Service;
@@ -179,6 +181,7 @@ public class ReferrerFilter implements F
/**
* Activate
*/
+ @Activate
protected void activate(final ComponentContext ctx) {
this.allowEmpty =
PropertiesUtil.toBoolean(ctx.getProperties().get(PROP_ALLOW_EMPTY),
DEFAULT_ALLOW_EMPTY);
String[] allowHosts =
PropertiesUtil.toStringArray(ctx.getProperties().get(PROP_HOSTS));
@@ -208,6 +211,7 @@ public class ReferrerFilter implements F
this.configPrinterRegistration =
registerConfigPrinter(ctx.getBundleContext());
}
+ @Deactivate
protected void deactivate() {
this.configPrinterRegistration.unregister();
}