You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by al...@apache.org on 2009/03/06 23:22:16 UTC
svn commit: r751109 - in /openjpa/trunk:
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/
openjpa-kernel/src/main/java/org/apache/openjpa/util/
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/
Author: allee8285
Date: Fri Mar 6 22:22:15 2009
New Revision: 751109
URL: http://svn.apache.org/viewvc?rev=751109&view=rev
Log:
OPENJPA-891 - Remove _recoverable attribute in StoreException and use _fatal instead, per Pinaki's suggestion.
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreException.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=751109&r1=751108&r2=751109&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Fri Mar 6 22:22:15 2009
@@ -4280,7 +4280,7 @@
storeEx = new StoreException(msg);
}
if (recoverable != null) {
- storeEx.setRecoverable(recoverable);
+ storeEx.setFatal(!recoverable);
}
return storeEx;
}
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreException.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreException.java?rev=751109&r1=751108&r2=751109&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreException.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreException.java Fri Mar 6 22:22:15 2009
@@ -35,8 +35,6 @@
public static final int REFERENTIAL_INTEGRITY = 4;
public static final int OBJECT_EXISTS = 5;
- private boolean recoverable = false;
-
public StoreException(String msg) {
super(msg);
}
@@ -60,12 +58,4 @@
public int getType() {
return STORE;
}
-
- public void setRecoverable(boolean recoverable) {
- this.recoverable = recoverable;
- }
-
- public boolean isRecoverable() {
- return recoverable;
- }
}
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java?rev=751109&r1=751108&r2=751109&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java Fri Mar 6 22:22:15 2009
@@ -165,7 +165,7 @@
(ke instanceof LockException ? ke : cause);
if (lockEx != null && lockEx.getLockLevel() >=
JPA2LockLevels.LOCK_PESSIMISTIC_READ) {
- if (lockEx.isRecoverable()) {
+ if (!lockEx.isFatal()) {
e = new org.apache.openjpa.persistence
.LockTimeoutException(
ke.getMessage(), getNestedThrowables(ke),