[sling-org-apache-sling-resourcemerger] branch master updated: releng: fix wrong null annotation

[kwin]

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-resourcemerger.git


The following commit(s) were added to refs/heads/master by this push:
     new 5b4044d  releng: fix wrong null annotation
5b4044d is described below

commit 5b4044d514d95018a222f9851a070ec8a749c714
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Wed Mar 10 09:53:57 2021 +0100

    releng: fix wrong null annotation
---
 .../java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java 
b/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java
index f8e7a9c..07961b5 100644
--- a/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java
+++ b/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java
@@ -72,7 +72,7 @@ public class CRUDMergedResource extends MergedResource {
     public <AdapterType> AdapterType adaptTo(final Class<AdapterType> type) {
         if (type == ModifiableValueMap.class) {
             final Iterator<@NotNull Resource> iter = 
this.picker.pickResources(this.getResourceResolver(), this.relativePath, 
null).iterator();
-            @NotNull Resource highestRsrc = null;
+            Resource highestRsrc = null;
             while ( iter.hasNext() ) {
                 highestRsrc = iter.next();
             }