You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by cu...@apache.org on 2011/06/29 21:11:31 UTC
svn commit: r1141200 - in /openjpa/branches/2.1.x:
openjpa-kernel/src/main/java/org/apache/openjpa/conf/
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/
Author: curtisr7
Date: Wed Jun 29 19:11:30 2011
New Revision: 1141200
URL: http://svn.apache.org/viewvc?rev=1141200&view=rev
Log:
OPENJPA-1986: Remove newly added serialVersionUID and change compatibility flag.
Modified:
openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java
openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java
openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestCascadePersist.java
Modified: openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java?rev=1141200&r1=1141199&r2=1141200&view=diff
==============================================================================
--- openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java (original)
+++ openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java Wed Jun 29 19:11:30 2011
@@ -67,7 +67,7 @@ public class Compatibility {
private boolean _reloadOnDetach = false;
private boolean _ignoreDetachedStateFieldForProxySerialization = false;
private boolean _convertPositionalParametersToNamed = false;
- private boolean _checkDatabaseForCascadePersistToDetachedEntity = false;
+ private boolean _checkDatabaseForCascadePersistToDetachedEntity = true;
/**
* Whether to require exact identity value types when creating object
Modified: openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java?rev=1141200&r1=1141199&r2=1141200&view=diff
==============================================================================
--- openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java (original)
+++ openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java Wed Jun 29 19:11:30 2011
@@ -52,10 +52,7 @@ import org.apache.openjpa.util.UserExcep
* on the held field.
*/
class SingleFieldManager extends TransferFieldManager implements Serializable {
- private static final long serialVersionUID = -6205985063476549150L;
-
- private static final Localizer _loc = Localizer.forPackage
- (SingleFieldManager.class);
+ private static final Localizer _loc = Localizer.forPackage(SingleFieldManager.class);
private final StateManagerImpl _sm;
private final BrokerImpl _broker;
Modified: openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestCascadePersist.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestCascadePersist.java?rev=1141200&r1=1141199&r2=1141200&view=diff
==============================================================================
--- openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestCascadePersist.java (original)
+++ openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestCascadePersist.java Wed Jun 29 19:11:30 2011
@@ -26,7 +26,7 @@ import org.apache.openjpa.persistence.te
public class TestCascadePersist extends SingleEMFTestCase {
@Override
public void setUp() throws Exception {
- setUp(DROP_TABLES, CascadePersistEntity.class, "openjpa.Log", "SQL=trace");
+ setUp(DROP_TABLES, CascadePersistEntity.class);
}
public void testCascadePersistToDetachedFailure() {
@@ -46,10 +46,8 @@ public class TestCascadePersist extends
em.persist(cpe2);
try {
em.getTransaction().commit();
+ // If running CheckDatabaseForCascadePersistToDetachedEntity=false we will expect an exception.
} catch (RollbackException re) {
- // We expect this failure because we are trying to cascade a persist to an existing Entity. Changing
- // CheckDatabaseForCascadePersistToDetachedEntity=true would avoid this exception and revert back to pre
- // 2.2.x behavior.
}
}