jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From un...@apache.org
Subject svn commit: r1350868 - /jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java
Date Sat, 16 Jun 2012 06:44:55 GMT
Author: unico
Date: Sat Jun 16 06:44:55 2012
New Revision: 1350868

URL: http://svn.apache.org/viewvc?rev=1350868&view=rev
Log:
JCR-3265 guard against possible npe's due to double checking: if the bundle is no longer there
we don't need to continue to check it (backport)

Modified:
    jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java

Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java?rev=1350868&r1=1350867&r2=1350868&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java
(original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java
Sat Jun 16 06:44:55 2012
@@ -309,6 +309,8 @@ public class ConsistencyCheckerImpl {
                             log.error(message);
                             missingChildren.add(entry);
                         }
+                    } else {
+                        return;
                     }
                 } else {
                     NodeId cp = childBundle.getParentId();
@@ -333,6 +335,8 @@ public class ConsistencyCheckerImpl {
                                     log.error(message);
                                 }
                             }
+                        } else {
+                            return;
                         }
                     }
                 }
@@ -376,6 +380,8 @@ public class ConsistencyCheckerImpl {
                                 modifications.add(bundle);
                             }
                         }
+                    } else {
+                        return;
                     }
                 } else {
                     boolean found = false;
@@ -410,6 +416,8 @@ public class ConsistencyCheckerImpl {
                                         + "'");
                                 modifications.add(parentBundle);
                             }
+                        } else {
+                            return;
                         }
                     }
 



Mime
View raw message