[sling-org-apache-sling-servlets-annotations] branch master updated: improve description for servletName

[kw...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 1ea0418  improve description for servletName
     new 9b0ef61  Merge branch 'master' of git@github.com:apache/sling-org-apache-sling-servlets-annotations.git
1ea0418 is described below

commit 1ea0418f47ed7860cf7e694e64ac79bc5524bb7f
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Dec 17 17:29:47 2018 +0100

    improve description for servletName
---
 .../org/apache/sling/servlets/annotations/SlingServletName.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/sling/servlets/annotations/SlingServletName.java b/src/main/java/org/apache/sling/servlets/annotations/SlingServletName.java
index 30d62dd..b6fe56b 100644
--- a/src/main/java/org/apache/sling/servlets/annotations/SlingServletName.java
+++ b/src/main/java/org/apache/sling/servlets/annotations/SlingServletName.java
@@ -36,9 +36,9 @@ public @interface SlingServletName {
 
     /**
      * Containing the name of the servlet. If this is empty (or not set), the
-     * <code>component.name</code> property or the <code>service.pid</code>
-     * is used. If none of the three properties is defined, the Servlet is
-     * ignored.
+     * <code>component.name</code> property, the <code>service.pid</code> or the
+     * <code>service.id</code> is used. At least the latter is  always ensured by the OSGi framework
+     * so a name is always set!
      * @return the servlet name
      * @see ServletResolverConstants#SLING_SERVLET_NAME
      */