GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit

Commits:
70c7aad1 by Julian Reschke at 2017-01-19T13:10:38+00:00
JCR-4102: jcr2dav: change polling thread sometimes dies with NPE

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1779460 
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/70c7aad14c8714a63ff1e68b80e49ffc73d43531
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

Reply via email to