Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 55531 invoked from network); 30 Mar 2011 17:58:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Mar 2011 17:58:54 -0000 Received: (qmail 97875 invoked by uid 500); 30 Mar 2011 17:58:54 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 97818 invoked by uid 500); 30 Mar 2011 17:58:54 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 97811 invoked by uid 99); 30 Mar 2011 17:58:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Mar 2011 17:58:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Mar 2011 17:58:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9EDA523889DA; Wed, 30 Mar 2011 17:58:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1087028 - in /openjpa: branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ branches/2.1.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/ trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ trunk/o... Date: Wed, 30 Mar 2011 17:58:32 -0000 To: commits@openjpa.apache.org From: allee8285@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110330175832.9EDA523889DA@eris.apache.org> Author: allee8285 Date: Wed Mar 30 17:58:32 2011 New Revision: 1087028 URL: http://svn.apache.org/viewvc?rev=1087028&view=rev Log: OPENJPA-1969 - Decode HYT00 to LockTimeoutException Modified: openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java openjpa/branches/2.1.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml Modified: openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java?rev=1087028&r1=1087027&r2=1087028&view=diff ============================================================================== --- openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java (original) +++ openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java Wed Mar 30 17:58:32 2011 @@ -291,7 +291,7 @@ public class SQLServerDictionary extends public boolean isFatalException(int subtype, SQLException ex) { String errorState = ex.getSQLState(); if ((subtype == StoreException.LOCK || subtype == StoreException.QUERY) - &&("1222".equals(errorState) || "HY008".equals(errorState))) + &&("1222".equals(errorState) || "HY008".equals(errorState) || "HYT00".equals(errorState))) return false; return super.isFatalException(subtype, ex); } Modified: openjpa/branches/2.1.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml?rev=1087028&r1=1087027&r2=1087028&view=diff ============================================================================== --- openjpa/branches/2.1.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml (original) +++ openjpa/branches/2.1.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml Wed Mar 30 17:58:32 2011 @@ -47,12 +47,12 @@ - 1204,1205,1222,HY008,40001 + 1204,1205,1222,HY008,HYT00,40001 544,2601,2627,8114,8115 23000 1205 - HY008 + HY008,HYT00 Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java?rev=1087028&r1=1087027&r2=1087028&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java Wed Mar 30 17:58:32 2011 @@ -291,7 +291,7 @@ public class SQLServerDictionary extends public boolean isFatalException(int subtype, SQLException ex) { String errorState = ex.getSQLState(); if ((subtype == StoreException.LOCK || subtype == StoreException.QUERY) - &&("1222".equals(errorState) || "HY008".equals(errorState))) + &&("1222".equals(errorState) || "HY008".equals(errorState) || "HYT00".equals(errorState))) return false; return super.isFatalException(subtype, ex); } Modified: openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml?rev=1087028&r1=1087027&r2=1087028&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml (original) +++ openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml Wed Mar 30 17:58:32 2011 @@ -47,12 +47,12 @@ - 1204,1205,1222,HY008,40001 + 1204,1205,1222,HY008,HYT00,40001 544,2601,2627,8114,8115 23000 1205 - HY008 + HY008,HYT00