Author: tolusha Date: 2011-10-26 08:53:22 -0400 (Wed, 26 Oct 2011) New Revision: 5098 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/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: small fix 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 12:17:42 UTC (rev 5097) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2011-10-26 12:53:22 UTC (rev 5098) @@ -556,7 +556,6 @@ /** * {@inheritDoc} */ - @Override protected void deleteLockProperties() throws SQLException { PreparedStatement removeValuesStatement = null; @@ -567,14 +566,10 @@ removeValuesStatement = dbConnection .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 = '[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()); removeValuesStatement.executeUpdate(); removeItemsStatement.executeUpdate(); 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 12:17:42 UTC (rev 5097) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2011-10-26 12:53:22 UTC (rev 5098) @@ -578,7 +578,6 @@ /** * {@inheritDoc} */ - @Override protected void deleteLockProperties() throws SQLException { PreparedStatement removeValuesStatement = null; @@ -590,15 +589,11 @@ dbConnection .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 = '[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(); 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 12:17:42 UTC (rev 5097) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java 2011-10-26 12:53:22 UTC (rev 5098) @@ -1033,7 +1033,6 @@ /** * {@inheritDoc} */ - @Override protected void deleteLockProperties() throws SQLException { PreparedStatement removeValuesStatement = null; 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 12:17:42 UTC (rev 5097) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java 2011-10-26 12:53:22 UTC (rev 5098) @@ -951,7 +951,6 @@ /** * {@inheritDoc} */ - @Override protected void deleteLockProperties() throws SQLException { PreparedStatement removeValuesStatement = null;