GitLab Mirror pushed to branch 2.14 at cms-community / hippo-jackrabbit
Commits: 23d5bac5 by Julian Reschke at 2017-01-19T13:28:30+00:00 JCR-4102: jcr2dav: change polling thread sometimes dies with NPE (ported to 2.14) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.14@1779462 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 1 changed file: - jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java Changes: ===================================== jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java ===================================== --- a/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java +++ b/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java @@ -333,14 +333,14 @@ class URIResolverImpl implements URIResolver { 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; } View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/23d5bac5f4af4096a21143156072c3fddfee6a73
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
