svn commit: r1674232 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/PropertyValues.java

[an...@apache.org]

Author: angela
Date: Fri Apr 17 08:05:53 2015
New Revision: 1674232

URL: http://svn.apache.org/r1674232
Log:
OAK-2674 : Fix FindBug Issues

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/PropertyValues.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/PropertyValues.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/PropertyValues.java?rev=1674232&r1=1674231&r2=1674232&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/PropertyValues.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/PropertyValues.java Fri Apr 17 08:05:53 2015
@@ -25,6 +25,7 @@ import java.net.URI;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.jcr.PropertyType;
 
 import org.apache.jackrabbit.oak.api.Blob;
@@ -246,11 +247,11 @@ public final class PropertyValues {
      * 
      * @param value the value to convert
      * @param targetType the target property type 
-     * @param mapper the name mapper
+     * @param mapper the name mapper or {@code null} if no name/path mapping is required.
      * @return the converted value
      * @throws IllegalArgumentException if mapping is illegal
      */
-    public static PropertyValue convert(@Nonnull PropertyValue value, int targetType, @Nonnull NamePathMapper mapper) {
+    public static PropertyValue convert(@Nonnull PropertyValue value, int targetType, @Nullable NamePathMapper mapper) {
         int sourceType = value.getType().tag();
         if (sourceType == targetType) {
             return value;