Author: nzamosenchuk Date: 2009-11-25 09:56:57 -0500 (Wed, 25 Nov 2009) New Revision: 863 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java Log: EXOJCR-262: Cleanup lock data on startup: refactoring. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2009-11-25 14:53:11 UTC (rev 862) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2009-11-25 14:56:57 UTC (rev 863) @@ -763,8 +763,8 @@ if (deleteLockValues == null) { deleteLockValues = dbConnection.prepareStatement(DELETE_LOCK_VALUES); - deleteLockValues.setString(1, "[" + Constants.NS_JCR_URI + "]" + Constants.JCR_LOCKISDEEP.getName()); - deleteLockValues.setString(2, "[" + Constants.NS_JCR_URI + "]" + Constants.JCR_LOCKOWNER.getName()); + deleteLockValues.setString(1, Constants.JCR_LOCKISDEEP.getAsString()); + deleteLockValues.setString(2, Constants.JCR_LOCKOWNER.getAsString()); } deleteLockValues.executeUpdate(); @@ -773,8 +773,8 @@ if (deleteLockProperties == null) { deleteLockProperties = dbConnection.prepareStatement(DELETE_LOCK_PROPERTIES); - deleteLockProperties.setString(1, "[" + Constants.NS_JCR_URI + "]" + Constants.JCR_LOCKISDEEP.getName()); - deleteLockProperties.setString(2, "[" + Constants.NS_JCR_URI + "]" + Constants.JCR_LOCKOWNER.getName()); + deleteLockProperties.setString(1, Constants.JCR_LOCKISDEEP.getAsString()); + deleteLockProperties.setString(2, Constants.JCR_LOCKOWNER.getAsString()); } deleteLockProperties.executeUpdate(); Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2009-11-25 14:53:11 UTC (rev 862) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2009-11-25 14:56:57 UTC (rev 863) @@ -780,8 +780,8 @@ if (deleteLockValues == null) { deleteLockValues = dbConnection.prepareStatement(DELETE_LOCK_VALUES); - deleteLockValues.setString(1, "[" + Constants.NS_JCR_URI + "]" + Constants.JCR_LOCKISDEEP.getName()); - deleteLockValues.setString(2, "[" + Constants.NS_JCR_URI + "]" + Constants.JCR_LOCKOWNER.getName()); + deleteLockValues.setString(1, Constants.JCR_LOCKISDEEP.getAsString()); + deleteLockValues.setString(2, Constants.JCR_LOCKOWNER.getAsString()); } deleteLockValues.executeUpdate(); @@ -790,8 +790,8 @@ if (deleteLockProperties == null) { deleteLockProperties = dbConnection.prepareStatement(DELETE_LOCK_PROPERTIES); - deleteLockProperties.setString(1, "[" + Constants.NS_JCR_URI + "]" + Constants.JCR_LOCKISDEEP.getName()); - deleteLockProperties.setString(2, "[" + Constants.NS_JCR_URI + "]" + Constants.JCR_LOCKOWNER.getName()); + deleteLockProperties.setString(1, Constants.JCR_LOCKISDEEP.getAsString()); + deleteLockProperties.setString(2, Constants.JCR_LOCKOWNER.getAsString()); } deleteLockProperties.executeUpdate();