Author: areshetnyak Date: 2009-11-17 11:24:46 -0500 (Tue, 17 Nov 2009) New Revision: 726 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/SQLExceptionHandler.java Log: EXOJCR-249 : The JDBCStorageConnection, SQLExceptionHandler was changed. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-17 16:20:15 UTC (rev 725) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-17 16:24:46 UTC (rev 726) @@ -1937,7 +1937,7 @@ { if (LOG.isDebugEnabled()) LOG.error("Node remove. Database error: " + e, e); - exceptionHandler.handleDeleteException(e, identifier, true, ""); + exceptionHandler.handleDeleteException(e, identifier, true); } } @@ -1991,7 +1991,7 @@ { if (LOG.isDebugEnabled()) LOG.error("Property remove. Database error: " + e, e); - exceptionHandler.handleDeleteException(e, identifier, true, ""); + exceptionHandler.handleDeleteException(e, identifier, true); } } Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/SQLExceptionHandler.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/SQLExceptionHandler.java 2009-11-17 16:20:15 UTC (rev 725) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/SQLExceptionHandler.java 2009-11-17 16:24:46 UTC (rev 726) @@ -338,21 +338,20 @@ * * @param e * - an SQLException - * @param item - * - context ItemData + * @param itemId + * - identifier of ItemData * @return String with error message * @throws RepositoryException * if <code>RepositoryException</code> should be thrown * @throws InvalidItemStateException * if <code>InvalidItemStateException</code> should be thrown */ - protected String handleDeleteException(SQLException e, String itemId, boolean isNode, String path ) throws RepositoryException, + protected String handleDeleteException(SQLException e, String itemId, boolean isNode) throws RepositoryException, InvalidItemStateException { String message = "[" + containerName + "] DELETE " + (isNode ? "NODE. " : "PROPERTY. "); String errMessage = e.getMessage(); - String itemInfo = - path + " " + itemId + String itemInfo = "ID = " + itemId + (errMessage != null ? ". Cause >>>> " + errMessage : ""); if (errMessage != null)