svn commit: r452824 - /db/ojb/trunk/src/test/org/apache/ojb/broker/OptimisticLockingTest.java

[arminw]

Author: arminw
Date: Wed Oct  4 03:13:07 2006
New Revision: 452824

URL: http://svn.apache.org/viewvc?view=rev&rev=452824
Log:
use IdentityFactory

Modified:
    db/ojb/trunk/src/test/org/apache/ojb/broker/OptimisticLockingTest.java

Modified: db/ojb/trunk/src/test/org/apache/ojb/broker/OptimisticLockingTest.java
URL: 
http://svn.apache.org/viewvc/db/ojb/trunk/src/test/org/apache/ojb/broker/OptimisticLockingTest.java?view=diff&rev=452824&r1=452823&r2=452824
==============================================================================
--- db/ojb/trunk/src/test/org/apache/ojb/broker/OptimisticLockingTest.java 
(original)
+++ db/ojb/trunk/src/test/org/apache/ojb/broker/OptimisticLockingTest.java Wed 
Oct  4 03:13:07 2006
@@ -77,12 +77,12 @@
     {
         LockedByVersion obj = new LockedByVersion();
         obj.setValue("original");
-        Identity oid = new Identity(obj, broker);
         broker.beginTransaction();
         broker.store(obj);
         broker.commitTransaction();
 
         broker.clearCache();
+        Identity oid = broker.serviceIdentity().buildIdentity(obj);
         LockedByVersion copy1 = (LockedByVersion) 
broker.getObjectByIdentity(oid);
         broker.clearCache();
         LockedByVersion copy2 = (LockedByVersion) 
broker.getObjectByIdentity(oid);
@@ -121,10 +121,10 @@
     {
         LockedByVersion obj = new LockedByVersion();
         obj.setValue("original");
-        Identity oid = new Identity(obj, broker);
         broker.beginTransaction();
         broker.store(obj);
         broker.commitTransaction();
+        Identity oid = broker.serviceIdentity().buildIdentity(obj);
 
         broker.clearCache();
         LockedByVersion copy1 = (LockedByVersion) 
broker.getObjectByIdentity(oid);
@@ -154,7 +154,7 @@
 
 // get a synchronized instance
             broker.removeFromCache(conflictingObject);
-            Object syncronizedObject = broker.getObjectByIdentity(new 
Identity(conflictingObject, broker));
+            Object syncronizedObject = 
broker.getObjectByIdentity(broker.serviceIdentity().buildIdentity(conflictingObject));
 
 // modify synchronized copy and call store again without trouble
             ((LockedByVersion) syncronizedObject).setValue("copy 3");
@@ -174,11 +174,11 @@
     {
         LockedByTimestamp obj = new LockedByTimestamp();
         obj.setValue("original");
-        Identity oid = new Identity(obj, broker);
         broker.beginTransaction();
         broker.store(obj);
         broker.commitTransaction();
-
+        Identity oid = broker.serviceIdentity().buildIdentity(obj);
+        
         broker.clearCache();
         LockedByTimestamp copy1 = (LockedByTimestamp) 
broker.getObjectByIdentity(oid);
         broker.clearCache();



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]