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 2008/09/16 18:12:15 UTC
svn commit: r695958 - in /jackrabbit/branches/1.4/jackrabbit-core: ./
src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
Author: jukka
Date: Tue Sep 16 09:12:13 2008
New Revision: 695958
URL: http://svn.apache.org/viewvc?rev=695958&view=rev
Log:
1.4: Merged revision 672125 (JCR-1657)
Modified:
jackrabbit/branches/1.4/jackrabbit-core/ (props changed)
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
Propchange: jackrabbit/branches/1.4/jackrabbit-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 16 09:12:13 2008
@@ -1 +1 @@
-/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583,668147,679389,680135,686688,691550,694164
+/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583,668147,672125,679389,680135,686688,691550,694164
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java?rev=695958&r1=695957&r2=695958&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java Tue Sep 16 09:12:13 2008
@@ -669,9 +669,8 @@
*/
protected void buildSQLStatements() {
selectRevisionsStmtSQL =
- "select REVISION_ID, JOURNAL_ID, PRODUCER_ID, REVISION_DATA " +
- "from " + schemaObjectPrefix + "JOURNAL " +
- "where REVISION_ID > ?";
+ "select REVISION_ID, JOURNAL_ID, PRODUCER_ID, REVISION_DATA from "
+ + schemaObjectPrefix + "JOURNAL where REVISION_ID > ? order by REVISION_ID";
updateGlobalStmtSQL =
"update " + schemaObjectPrefix + "GLOBAL_REVISION"
+ " set REVISION_ID = REVISION_ID + 1";