You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/05/06 16:10:00 UTC

svn commit: r1678000 - /jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/BundleLoader.java

Author: chetanm
Date: Wed May  6 14:10:00 2015
New Revision: 1678000

URL: http://svn.apache.org/r1678000
Log:
OAK-2841 - Log NodePropBundle id for which no bundle is found

Merge 1677991

Modified:
    jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/BundleLoader.java

Modified: jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/BundleLoader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/BundleLoader.java?rev=1678000&r1=1677999&r2=1678000&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/BundleLoader.java (original)
+++ jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/BundleLoader.java Wed May  6 14:10:00 2015
@@ -30,6 +30,8 @@ import org.apache.jackrabbit.core.state.
 import org.apache.jackrabbit.spi.Name;
 import org.apache.jackrabbit.spi.commons.name.NameConstants;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 class BundleLoader {
 
     private final PersistenceManager pm;
@@ -57,7 +59,8 @@ class BundleLoader {
     NodePropBundle loadBundle(NodeId id) throws ItemStateException {
         if (loadBundle != null) {
             try {
-                return (NodePropBundle) loadBundle.invoke(pm, id);
+                return checkNotNull((NodePropBundle) loadBundle.invoke(pm, id),
+                        "Could not load NodePropBundle for id [%s]", id);
             } catch (InvocationTargetException e) {
                 if (e.getCause() instanceof ItemStateException) {
                     throw (ItemStateException) e.getCause();
@@ -71,6 +74,7 @@ class BundleLoader {
         }
 
         NodeState state = pm.load(id);
+        checkNotNull(state, "Could not load NodeState for id [%s]", id);
         NodePropBundle bundle = new NodePropBundle(state);
         for (Name name : state.getPropertyNames()) {
             if (NameConstants.JCR_UUID.equals(name)) {