You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/02/16 16:33:45 UTC
svn commit: r744940 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
Author: jukka
Date: Mon Feb 16 15:33:42 2009
New Revision: 744940
URL: http://svn.apache.org/viewvc?rev=744940&view=rev
Log:
JCR-1923: Startup fails if clustered jackrabbit is upgrade from 1.4.4 to 1.5
As suggested by Christian Schröder, moved the checkLocalRevisionSchema() call to be performed right after checkSchema().
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java?rev=744940&r1=744939&r2=744940&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java Mon Feb 16 15:33:42 2009
@@ -303,6 +303,9 @@
connection = getConnection();
setAutoCommit(connection, true);
checkSchema();
+ // Make sure that the LOCAL_REVISIONS table exists (see JCR-1087)
+ checkLocalRevisionSchema();
+
buildSQLStatements();
prepareStatements();
initInstanceRevisionAndJanitor();
@@ -358,9 +361,6 @@
protected void initInstanceRevisionAndJanitor() throws Exception {
databaseRevision = new DatabaseRevision();
- // Make sure that the LOCAL_REVISIONS table exists (checkSchema has already been called) (see JCR-1087)
- checkLocalRevisionSchema();
-
// Get the local file revision from disk (upgrade; see JCR-1087)
long localFileRevision = 0L;
if (getRevision() != null) {