You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2017/01/19 13:28:30 UTC
svn commit: r1779462 - in /jackrabbit/branches/2.14: ./
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
Author: reschke
Date: Thu Jan 19 13:28:30 2017
New Revision: 1779462
URL: http://svn.apache.org/viewvc?rev=1779462&view=rev
Log:
JCR-4102: jcr2dav: change polling thread sometimes dies with NPE (ported to 2.14)
Modified:
jackrabbit/branches/2.14/ (props changed)
jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
Propchange: jackrabbit/branches/2.14/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 13:28:30 2017
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1779166
+/jackrabbit/trunk:1779166,1779460
Modified: jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java?rev=1779462&r1=1779461&r2=1779462&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java (original)
+++ jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java Thu Jan 19 13:28:30 2017
@@ -333,14 +333,14 @@ class URIResolverImpl implements URIReso
public NodeId getNodeIdAfterEvent(String uri, SessionInfo sessionInfo, boolean nodeIsGone) throws RepositoryException {
return getNodeId(uri, sessionInfo, nodeIsGone);
}
-
+
/**
* @inheritDoc
*/
public PropertyId getPropertyId(String uri, SessionInfo sessionInfo) throws RepositoryException {
IdURICache cache = getCache(sessionInfo.getWorkspaceName());
- if (cache.containsUri(uri)) {
- ItemId id = cache.getItemId(uri);
+ ItemId id = cache.getItemId(uri);
+ if (id != null) {
if (!id.denotesNode()) {
return (PropertyId) id;
}