You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by st...@apache.org on 2012/08/24 15:44:56 UTC
svn commit: r1376911 -
/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/H2Persistence.java
Author: stefan
Date: Fri Aug 24 13:44:56 2012
New Revision: 1376911
URL: http://svn.apache.org/viewvc?rev=1376911&view=rev
Log:
OAK-276: don't silently ignore commit id collision
Modified:
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/H2Persistence.java
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/H2Persistence.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/H2Persistence.java?rev=1376911&r1=1376910&r2=1376911&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/H2Persistence.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/H2Persistence.java Fri Aug 24 13:44:56 2012
@@ -195,12 +195,11 @@ public class H2Persistence implements GC
try {
PreparedStatement stmt = con
.prepareStatement(
- "insert into REVS (ID, DATA, TIME) select ?, ?, ? where not exists (select 1 from REVS where ID = ?)");
+ "insert into REVS (ID, DATA, TIME) select ?, ?, ?");
try {
stmt.setBytes(1, id.getBytes());
stmt.setBytes(2, bytes);
stmt.setTimestamp(3, ts);
- stmt.setBytes(4, id.getBytes());
stmt.executeUpdate();
} finally {
stmt.close();