FELIX-2305 : Servlets should not be immediate
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@938378 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
index 091b0cf..b3303e2 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
@@ -30,7 +30,7 @@
public @interface SlingServlet {
/**
- * Whether to generate a default SCR component tag with "immediate=true". If
+ * Whether to generate a default SCR component tag. If
* set to false, a {@link org.apache.felix.scr.annotations.Component}
* annotation can be added manually with defined whatever configuration
* needed.
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
index 42cbe8e..67c512b 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
@@ -32,9 +32,6 @@
*/
public class SlingServletComponentTag extends AbstractTag {
- private static final Map<String, String> IMMEDIATE_MAP =
- Collections.singletonMap(Constants.COMPONENT_IMMEDIATE, String.valueOf(true));
-
/**
* @param desc Description
*/
@@ -49,7 +46,7 @@
@Override
public Map<String, String> createNamedParameterMap() {
- return IMMEDIATE_MAP;
+ return Collections.emptyMap();
}
}