Author: arminw
Date: Wed Feb 22 13:11:53 2006
New Revision: 379900
URL: http://svn.apache.org/viewcvs?rev=379900&view=rev
Log:
fix PB leaks
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/MultipleDBTest.java
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/NativeIdentifierTest.java
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/SequenceManagerTest.java
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/MultipleDBTest.java
URL:
http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/MultipleDBTest.java?rev=379900&r1=379899&r2=379900&view=diff
==============================================================================
---
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/MultipleDBTest.java
(original)
+++
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/MultipleDBTest.java
Wed Feb 22 13:11:53 2006
@@ -60,39 +60,47 @@
*/
public void testMaterializeFromDifferentDB()
{
- String name = "testMaterializeFromDifferentDB" +
System.currentTimeMillis();
+ String name = "testMaterializeFromDifferentDB_" +
System.currentTimeMillis();
PersistenceBroker broker =
PersistenceBrokerFactory.defaultPersistenceBroker();
PersistenceBroker brokerFarAway =
PersistenceBrokerFactory.createPersistenceBroker(TestHelper.FAR_AWAY_KEY);
- MultipleObject obj = new MultipleObject();
- obj.setName(name);
- broker.beginTransaction();
- broker.store(obj);
- broker.commitTransaction();
-
- Identity oid = new Identity(obj, broker);
-
- MultipleObjectRef ref_1 = new MultipleObjectRef();
- MultipleObjectRef ref_2 = new MultipleObjectRef();
- ref_1.setName(name);
- ref_1.setRefId(obj.getId());
- ref_2.setName(name);
- ref_2.setRefId(obj.getId());
-
- brokerFarAway.beginTransaction();
- brokerFarAway.store(ref_1);
- brokerFarAway.store(ref_2);
- brokerFarAway.commitTransaction();
-
- broker.clearCache();
- brokerFarAway.clearCache();
-
- MultipleObject newObj =
(MultipleObject)broker.getObjectByIdentity(oid);
- brokerFarAway.retrieveAllReferences(newObj);
-
- assertNotNull(newObj.getReferences());
- assertEquals(2, newObj.getReferences().size());
- // System.out.println("## " + newObj);
+ try
+ {
+ MultipleObject obj = new MultipleObject();
+ obj.setName(name);
+ broker.beginTransaction();
+ broker.store(obj);
+ broker.commitTransaction();
+
+ Identity oid = broker.serviceIdentity().buildIdentity(obj);
+
+ MultipleObjectRef ref_1 = new MultipleObjectRef();
+ MultipleObjectRef ref_2 = new MultipleObjectRef();
+ ref_1.setName(name);
+ ref_1.setRefId(obj.getId());
+ ref_2.setName(name);
+ ref_2.setRefId(obj.getId());
+
+ brokerFarAway.beginTransaction();
+ brokerFarAway.store(ref_1);
+ brokerFarAway.store(ref_2);
+ brokerFarAway.commitTransaction();
+
+ broker.clearCache();
+ brokerFarAway.clearCache();
+
+ MultipleObject newObj =
(MultipleObject)broker.getObjectByIdentity(oid);
+ brokerFarAway.retrieveAllReferences(newObj);
+
+ assertNotNull(newObj.getReferences());
+ assertEquals(2, newObj.getReferences().size());
+ // System.out.println("## " + newObj);
+ }
+ finally
+ {
+ if(broker != null) broker.close();
+ if(brokerFarAway != null) brokerFarAway.close();
+ }
}
/**
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/NativeIdentifierTest.java
URL:
http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/NativeIdentifierTest.java?rev=379900&r1=379899&r2=379900&view=diff
==============================================================================
---
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/NativeIdentifierTest.java
(original)
+++
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/NativeIdentifierTest.java
Wed Feb 22 13:11:53 2006
@@ -690,6 +690,7 @@
obj_2.setName(name+"_update");
tx.commit();
+ broker.close();
broker = PersistenceBrokerFactory.defaultPersistenceBroker();
obj_2 = (MainObject) broker.getObjectByIdentity(oid_2);
broker.close();
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/SequenceManagerTest.java
URL:
http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/SequenceManagerTest.java?rev=379900&r1=379899&r2=379900&view=diff
==============================================================================
---
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/SequenceManagerTest.java
(original)
+++
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/broker/sequence/SequenceManagerTest.java
Wed Feb 22 13:11:53 2006
@@ -509,6 +509,7 @@
assertTrue(id2 > id1);
assertTrue("If the sequence manger implementation does not support
continuous key generation" +
" per PB instance, you could ignore this failure", (id2 - id1)
== 1);
+ pb.close();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
