jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1360939 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
Date Thu, 12 Jul 2012 21:01:14 GMT
Author: mduerig
Date: Thu Jul 12 21:01:14 2012
New Revision: 1360939

URL: http://svn.apache.org/viewvc?rev=1360939&view=rev
Log:
OAK-185: Trying to remove a missing property throws PathNotFoundException
Fix @Nullable annotations

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java?rev=1360939&r1=1360938&r2=1360939&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
Thu Jul 12 21:01:14 2012
@@ -25,6 +25,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import javax.jcr.Binary;
 import javax.jcr.InvalidItemStateException;
@@ -246,7 +247,7 @@ public class NodeImpl extends ItemImpl<N
      * @see Node#setProperty(String, javax.jcr.Value)
      */
     @Override
-    @Nonnull
+    @CheckForNull
     public Property setProperty(String name, Value value) throws RepositoryException {
         int type = PropertyType.UNDEFINED;
         if (value != null) {
@@ -259,7 +260,7 @@ public class NodeImpl extends ItemImpl<N
      * @see Node#setProperty(String, javax.jcr.Value, int)
      */
     @Override
-    @Nonnull
+    @CheckForNull
     public Property setProperty(String jcrName, Value value, int type)
             throws RepositoryException {
         checkStatus();
@@ -339,7 +340,7 @@ public class NodeImpl extends ItemImpl<N
      * @see Node#setProperty(String, String)
      */
     @Override
-    @Nonnull
+    @CheckForNull
     public Property setProperty(String name, String value) throws RepositoryException {
         Value v = (value == null) ? null : getValueFactory().createValue(value, PropertyType.STRING);
         return setProperty(name, v, PropertyType.UNDEFINED);
@@ -349,7 +350,7 @@ public class NodeImpl extends ItemImpl<N
      * @see Node#setProperty(String, String, int)
      */
     @Override
-    @Nonnull
+    @CheckForNull
     public Property setProperty(String name, String value, int type) throws RepositoryException
{
         Value v = (value == null) ? null : getValueFactory().createValue(value, type);
         return setProperty(name, v, type);
@@ -360,7 +361,7 @@ public class NodeImpl extends ItemImpl<N
      */
     @SuppressWarnings("deprecation")
     @Override
-    @Nonnull
+    @CheckForNull
     public Property setProperty(String name, InputStream value) throws RepositoryException
{
         Value v = (value == null ? null : getValueFactory().createValue(value));
         return setProperty(name, v, PropertyType.BINARY);
@@ -370,7 +371,7 @@ public class NodeImpl extends ItemImpl<N
      * @see Node#setProperty(String, Binary)
      */
     @Override
-    @Nonnull
+    @CheckForNull
     public Property setProperty(String name, Binary value) throws RepositoryException {
         Value v = (value == null ? null : getValueFactory().createValue(value));
         return setProperty(name, v, PropertyType.BINARY);
@@ -398,7 +399,7 @@ public class NodeImpl extends ItemImpl<N
      * @see Node#setProperty(String, BigDecimal)
      */
     @Override
-    @Nonnull
+    @CheckForNull
     public Property setProperty(String name, BigDecimal value) throws RepositoryException
{
         Value v = (value == null ? null : getValueFactory().createValue(value));
         return setProperty(name, v, PropertyType.DECIMAL);
@@ -417,7 +418,7 @@ public class NodeImpl extends ItemImpl<N
      * @see Node#setProperty(String, Calendar)
      */
     @Override
-    @Nonnull
+    @CheckForNull
     public Property setProperty(String name, Calendar value) throws RepositoryException {
         Value v = (value == null ? null : getValueFactory().createValue(value));
         return setProperty(name, v, PropertyType.DATE);
@@ -427,7 +428,7 @@ public class NodeImpl extends ItemImpl<N
      * @see Node#setProperty(String, Node)
      */
     @Override
-    @Nonnull
+    @CheckForNull
     public Property setProperty(String name, Node value) throws RepositoryException {
         Value v = (value == null) ? null : getValueFactory().createValue(value);
         return setProperty(name, v, PropertyType.REFERENCE);



Mime
View raw message