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

rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.3.4
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit 723dd32444123d4ca59564d8267c550f54676f53
Author: Georg Henzler <[email protected]>
AuthorDate: Thu Mar 2 15:00:01 2017 +0000

    SLING-6587 improved javadoc
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1785149
 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java 
b/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java
index 6933074..9cebb94 100644
--- 
a/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java
+++ 
b/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker2.java
@@ -63,7 +63,8 @@ public interface MergedResourcePicker2 {
     /**
      * Method invoked by the MergingResourceProvider to identify the resources 
to be merged for a given
      * relative path. The resources returned may be either resources returned 
from the ResourceResolver
-     * directory or an instance of NonExistingResource.
+     * directory or an instance of NonExistingResource. Returning an empty 
list will cause the resource 
+     * to not exist for consumers (resolver.getResource(path) will return 
null). 
      *
      * @param resolver the ResourceResolver
      * @param relativePath the path relative to the merge root

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to