jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dpfis...@apache.org
Subject svn commit: r617539 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
Date Fri, 01 Feb 2008 16:13:36 GMT
Author: dpfister
Date: Fri Feb  1 08:13:33 2008
New Revision: 617539

URL: http://svn.apache.org/viewvc?rev=617539&view=rev
Log:
JCR-1358 - Cluster revision file not closed 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=617539&r1=617538&r2=617539&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
Fri Feb  1 08:13:33 2008
@@ -264,8 +264,7 @@
             synchronized (this) {
                 try {
                     wait(syncDelay);
-                } catch (InterruptedException e) {
-                }
+                } catch (InterruptedException e) {}
 
                 if (status == STOPPED) {
                     return;
@@ -317,6 +316,8 @@
             status = STOPPED;
 
             journal.close();
+            instanceRevision.close();
+            
             notifyAll();
         }
     }
@@ -775,8 +776,8 @@
             try {
                 clusterContext.lockEventsReady(workspace);
             } catch (RepositoryException e) {
-                String msg = "Unable to make lock listener for workspace "
-                    + workspace + " online: " + e.getMessage();
+                String msg = "Unable to make lock listener for workspace " +
+                        workspace + " online: " + e.getMessage();
                 log.warn(msg);
             }
             listener = (LockEventListener) wspLockListeners.get(workspace);
@@ -805,8 +806,8 @@
             try {
                 clusterContext.lockEventsReady(workspace);
             } catch (RepositoryException e) {
-                String msg = "Unable to make lock listener for workspace "
-                    + workspace + " online: " + e.getMessage();
+                String msg = "Unable to make lock listener for workspace " +
+                        workspace + " online: " + e.getMessage();
                 log.warn(msg);
             }
             listener = (LockEventListener) wspLockListeners.get(workspace);
@@ -908,8 +909,8 @@
                 try {
                     clusterContext.updateEventsReady(workspace);
                 } catch (RepositoryException e) {
-                    String msg = "Error making update listener for workspace "
-                        + workspace + " online: " + e.getMessage();
+                    String msg = "Error making update listener for workspace " +
+                            workspace + " online: " + e.getMessage();
                     log.warn(msg);
                 }
                 listener = (UpdateEventListener) wspUpdateListeners.get(workspace);
@@ -1049,8 +1050,8 @@
             String msg = "Unable to read revision '" + record.getRevision() + "'.";
             log.error(msg, e);
         } catch (IllegalArgumentException e) {
-            String msg = "Error while processing revision "
-                + record.getRevision() + ": " + e.getMessage();
+            String msg = "Error while processing revision " +
+                    record.getRevision() + ": " + e.getMessage();
             log.error(msg);
         }
     }



Mime
View raw message