Author: tolusha Date: 2011-10-26 07:31:25 -0400 (Wed, 26 Oct 2011) New Revision: 5091 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java Log: EXOJCR-1590: fix names, add commit Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-10-26 10:06:35 UTC (rev 5090) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-10-26 11:31:25 UTC (rev 5091) @@ -922,14 +922,20 @@ { if (deleteLocks) { + boolean failed = true; JDBCStorageConnection conn = (JDBCStorageConnection)openConnection(); try { conn.deleteLockProperties(); + conn.commit(); + failed = false; } finally { - conn.close(); + if (failed) + { + conn.rollback(); + } } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2011-10-26 10:06:35 UTC (rev 5090) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2011-10-26 11:31:25 UTC (rev 5091) @@ -566,11 +566,13 @@ { removeValuesStatement = dbConnection - .prepareStatement("DELETE FROM JCR_MVALUE WHERE PROPERTY_ID IN (SELECT ID FROM JCR_MITEM WHERE NAME = ? OR NAME = ?)"); + .prepareStatement("DELETE FROM JCR_MVALUE WHERE PROPERTY_ID IN (SELECT ID FROM JCR_MITEM WHERE NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner')"); removeValuesStatement.setString(1, Constants.JCR_LOCKISDEEP.getAsString()); removeValuesStatement.setString(2, Constants.JCR_LOCKOWNER.getAsString()); - removeItemsStatement = dbConnection.prepareStatement("DELETE FROM JCR_MITEM WHERE NAME = ? OR NAME = ?"); + removeItemsStatement = + dbConnection + .prepareStatement("DELETE FROM JCR_MITEM WHERE NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner'"); removeItemsStatement.setString(1, Constants.JCR_LOCKISDEEP.getAsString()); removeItemsStatement.setString(2, Constants.JCR_LOCKOWNER.getAsString()); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2011-10-26 10:06:35 UTC (rev 5090) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2011-10-26 11:31:25 UTC (rev 5091) @@ -588,13 +588,14 @@ { removeValuesStatement = dbConnection - .prepareStatement("DELETE FROM JCR_SVALUE WHERE PROPERTY_ID IN (SELECT ID FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND (NAME = ? OR NAME = ?))"); + .prepareStatement("DELETE FROM JCR_SVALUE WHERE PROPERTY_ID IN (SELECT ID FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND (NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner'))"); removeValuesStatement.setString(1, containerName); removeValuesStatement.setString(2, Constants.JCR_LOCKISDEEP.getAsString()); removeValuesStatement.setString(3, Constants.JCR_LOCKOWNER.getAsString()); removeItemsStatement = - dbConnection.prepareStatement("DELETE FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND (NAME = ? OR NAME = ?)"); + dbConnection + .prepareStatement("DELETE FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND (NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner')"); removeItemsStatement.setString(1, containerName); removeItemsStatement.setString(2, Constants.JCR_LOCKISDEEP.getAsString()); removeItemsStatement.setString(3, Constants.JCR_LOCKOWNER.getAsString()); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java 2011-10-26 10:06:35 UTC (rev 5090) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java 2011-10-26 11:31:25 UTC (rev 5091) @@ -1043,13 +1043,11 @@ { removeValuesStatement = dbConnection - .prepareStatement("DELETE FROM JCR_MVALUE WHERE PROPERTY_ID IN (SELECT ID FROM JCR_MITEM WHERE NAME = ? OR NAME = ?)"); - removeValuesStatement.setString(1, Constants.JCR_LOCKISDEEP.getAsString()); - removeValuesStatement.setString(2, Constants.JCR_LOCKOWNER.getAsString()); + .prepareStatement("DELETE FROM JCR_MVALUE WHERE PROPERTY_ID IN (SELECT ID FROM JCR_MITEM WHERE NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner')"); - removeItemsStatement = dbConnection.prepareStatement("DELETE FROM JCR_MITEM WHERE NAME = ? OR NAME = ?"); - removeItemsStatement.setString(1, Constants.JCR_LOCKISDEEP.getAsString()); - removeItemsStatement.setString(2, Constants.JCR_LOCKOWNER.getAsString()); + removeItemsStatement = + dbConnection + .prepareStatement("DELETE FROM JCR_MITEM WHERE NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner'"); removeValuesStatement.executeUpdate(); removeItemsStatement.executeUpdate(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java 2011-10-26 10:06:35 UTC (rev 5090) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java 2011-10-26 11:31:25 UTC (rev 5091) @@ -961,16 +961,13 @@ { removeValuesStatement = dbConnection - .prepareStatement("DELETE FROM JCR_SVALUE WHERE PROPERTY_ID IN (SELECT ID FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND (NAME = ? OR NAME = ?))"); + .prepareStatement("DELETE FROM JCR_SVALUE WHERE PROPERTY_ID IN (SELECT ID FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND (NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner'))"); removeValuesStatement.setString(1, containerName); - removeValuesStatement.setString(2, Constants.JCR_LOCKISDEEP.getAsString()); - removeValuesStatement.setString(3, Constants.JCR_LOCKOWNER.getAsString()); removeItemsStatement = - dbConnection.prepareStatement("DELETE FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND (NAME = ? OR NAME = ?)"); + dbConnection + .prepareStatement("DELETE FROM JCR_SITEM WHERE CONTAINER_NAME = ? AND (NAME = '[http://www.jcp.org/jcr/1.0]lockIsDeep' OR NAME = '[http://www.jcp.org/jcr/1.0]lockOwner')"); removeItemsStatement.setString(1, containerName); - removeItemsStatement.setString(2, Constants.JCR_LOCKISDEEP.getAsString()); - removeItemsStatement.setString(3, Constants.JCR_LOCKOWNER.getAsString()); removeValuesStatement.executeUpdate(); removeItemsStatement.executeUpdate();