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 @@
</dictionary>
<dictionary class="org.apache.openjpa.jdbc.sql.SQLServerDictionary">
- <lock>1204,1205,1222,HY008,40001</lock>
+ <lock>1204,1205,1222,HY008,HYT00,40001</lock>
<referential-integrity>544,2601,2627,8114,8115</referential-integrity>
<object-exists>23000</object-exists>
<object-not-found></object-not-found>
<optimistic>1205</optimistic>
- <query>HY008</query>
+ <query>HY008,HYT00</query>
</dictionary>
<dictionary class="org.apache.openjpa.jdbc.sql.SybaseDictionary">
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 @@
</dictionary>
<dictionary class="org.apache.openjpa.jdbc.sql.SQLServerDictionary">
- <lock>1204,1205,1222,HY008,40001</lock>
+ <lock>1204,1205,1222,HY008,HYT00,40001</lock>
<referential-integrity>544,2601,2627,8114,8115</referential-integrity>
<object-exists>23000</object-exists>
<object-not-found></object-not-found>
<optimistic>1205</optimistic>
- <query>HY008</query>
+ <query>HY008,HYT00</query>
</dictionary>
<dictionary class="org.apache.openjpa.jdbc.sql.SybaseDictionary">
