Author: mreutegg
Date: Thu Aug 30 10:27:35 2012
New Revision: 1378878
URL: http://svn.apache.org/viewvc?rev=1378878&view=rev
Log:
JCR-3406: Journal doUnlock sometimes not called on repository shutdown
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java?rev=1378878&r1=1378877&r2=1378878&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
Thu Aug 30 10:27:35 2012
@@ -668,8 +668,11 @@ public class ClusterNode implements Runn
public void updateCommitted(Update update, String path) {
Record record = (Record) update.getAttribute(ATTRIBUTE_RECORD);
if (record == null) {
- String msg = "No record prepared.";
- log.warn(msg);
+ if (status == STARTED) {
+ log.warn("No record prepared.");
+ } else {
+ log.info("not started: update commit ignored.");
+ }
return;
}
try {
|