jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dpfis...@apache.org
Subject svn commit: r488329 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster: ClusterNode.java FileJournal.java
Date Mon, 18 Dec 2006 16:45:17 GMT
Author: dpfister
Date: Mon Dec 18 08:45:17 2006
New Revision: 488329

URL: http://svn.apache.org/viewvc?view=rev&rev=488329
Log:
JCR-623 - Clustering
+ Release write mutex when error occurs
+ Catch unexpected errors in synchronization listener

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/FileJournal.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?view=diff&rev=488329&r1=488328&r2=488329
==============================================================================
--- 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
Mon Dec 18 08:45:17 2006
@@ -195,6 +195,13 @@
             } catch (ClusterException e) {
                 String msg = "Periodic sync of journal failed: " + e.getMessage();
                 log.error(msg);
+            } catch (Exception e) {
+                String msg = "Unexpected error while syncing of journal: " + e.getMessage();
+                log.error(msg, e);
+            } catch (Error e) {
+                String msg = "Unexpected error while syncing of journal: " + e.getMessage();
+                log.error(msg, e);
+                throw e;
             }
         }
     }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/FileJournal.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/FileJournal.java?view=diff&rev=488329&r1=488328&r2=488329
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/FileJournal.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/FileJournal.java
Mon Dec 18 08:45:17 2006
@@ -189,7 +189,7 @@
      * @return revision file
      */
     public String getRevision() {
-        return directory;
+        return revision;
     }
 
     /**
@@ -639,6 +639,7 @@
         } finally {
             if (!prepared) {
                 globalRevision.unlock();
+                writeMutex.release();
             }
         }
     }



Mime
View raw message