You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2011/11/30 22:52:45 UTC

svn commit: r1208818 - /jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java

Author: tripod
Date: Wed Nov 30 21:52:44 2011
New Revision: 1208818

URL: http://svn.apache.org/viewvc?rev=1208818&view=rev
Log:
JCR-3163 NPE in RepositoryServiceImpl.getPropertyInfo()

Modified:
    jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java

Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java?rev=1208818&r1=1208817&r2=1208818&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java Wed Nov 30 21:52:44 2011
@@ -413,7 +413,7 @@ public class RepositoryServiceImpl exten
                     QValue qValue = getQValueFactory(sessionInfo).create(length, uri, QValueFactoryImpl.NO_INDEX) ;
                     return new PropertyInfoImpl(propertyId, p, propertyType, qValue);
                 }
-            } else if (props.contains(JCR_GET_STRING)) {
+            } else if (props.contains(JCR_GET_STRING) && props.get(JCR_GET_STRING).getValue() != null) {
                 // single valued non-binary property
                 String str = props.get(JCR_GET_STRING).getValue().toString();
                 QValue qValue = ValueFormat.getQValue(str, propertyType, getNamePathResolver(sessionInfo), getQValueFactory(sessionInfo));