Return-Path: <arminw@apache.org>
Mailing-List: contact ojb-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ojb-dev@jakarta.apache.org
Received: (qmail 343 invoked by uid 97); 10 Jan 2003 17:07:28 -0000
Received: (qmail 339 invoked by uid 98); 10 Jan 2003 17:07:27 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Received: (qmail 289 invoked from network); 10 Jan 2003 17:07:25 -0000
Received: from daedalus.apache.org (HELO apache.org) (63.251.56.142)
  by nagoya.betaversion.org with SMTP; 10 Jan 2003 17:07:25 -0000
Received: (qmail 88062 invoked by uid 500); 10 Jan 2003 17:06:03 -0000
Received: (qmail 88055 invoked from network); 10 Jan 2003 17:06:03 -0000
Received: from icarus.apache.org (63.251.56.143)
  by daedalus.apache.org with SMTP; 10 Jan 2003 17:06:03 -0000
Received: (qmail 56447 invoked by uid 1510); 10 Jan 2003 17:06:02 -0000
Date: 10 Jan 2003 17:06:02 -0000
Message-ID: <20030110170602.56446.qmail@icarus.apache.org>
From: arminw@apache.org
To: jakarta-ojb-cvs@apache.org
Subject: cvs commit: jakarta-ojb/src/java/org/apache/ojb/odmg/collections
 DListEntry.java DListImpl.java DMapEntry.java DMapImpl.java DSetImpl.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

arminw      2003/01/10 09:06:02

  Modified:    src/java/org/apache/ojb/odmg/collections DListEntry.java
                        DListImpl.java DMapEntry.java DMapImpl.java
                        DSetImpl.java
  Log:
  try to use current PB instance if present
  
  Revision  Changes    Path
  1.14      +1 -1      jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DListEntry.java
  
  Index: DListEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DListEntry.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DListEntry.java	9 Jan 2003 15:15:14 -0000	1.13
  +++ DListEntry.java	10 Jan 2003 17:06:02 -0000	1.14
  @@ -149,7 +149,7 @@
        */
       protected int generateNewId()
       {
  -        PBCapsule capsule = new PBCapsule(null, null);
  +        PBCapsule capsule = new PBCapsule(null, TxManagerFactory.instance().getTransaction());
           try
           {
               PersistenceBroker broker = capsule.getBroker();
  
  
  
  1.15      +1 -1      jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DListImpl.java
  
  Index: DListImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DListImpl.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DListImpl.java	9 Jan 2003 17:14:40 -0000	1.14
  +++ DListImpl.java	10 Jan 2003 17:06:02 -0000	1.15
  @@ -287,7 +287,7 @@
        */
       protected int generateNewId()
       {
  -        PBCapsule capsule = new PBCapsule(null, null);
  +        PBCapsule capsule = new PBCapsule(null, TxManagerFactory.instance().getTransaction());
           try
           {
               PersistenceBroker broker = capsule.getBroker();
  
  
  
  1.11      +2 -2      jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DMapEntry.java
  
  Index: DMapEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DMapEntry.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DMapEntry.java	24 Dec 2002 13:32:45 -0000	1.10
  +++ DMapEntry.java	10 Jan 2003 17:06:02 -0000	1.11
  @@ -129,7 +129,7 @@
        */
       protected int generateNewId()
       {
  -        PBCapsule capsule = new PBCapsule(null, null);
  +        PBCapsule capsule = new PBCapsule(null, TxManagerFactory.instance().getTransaction());
           try
           {
               PersistenceBroker broker = capsule.getBroker();
  
  
  
  1.14      +2 -2      jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DMapImpl.java
  
  Index: DMapImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DMapImpl.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DMapImpl.java	24 Dec 2002 13:32:45 -0000	1.13
  +++ DMapImpl.java	10 Jan 2003 17:06:02 -0000	1.14
  @@ -147,7 +147,7 @@
        */
       protected int generateNewId()
       {
  -        PBCapsule capsule = new PBCapsule(null, null);
  +        PBCapsule capsule = new PBCapsule(null, TxManagerFactory.instance().getTransaction());
           try
           {
               PersistenceBroker broker = capsule.getBroker();
  
  
  
  1.14      +1 -1      jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DSetImpl.java
  
  Index: DSetImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/odmg/collections/DSetImpl.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DSetImpl.java	9 Jan 2003 17:14:40 -0000	1.13
  +++ DSetImpl.java	10 Jan 2003 17:06:02 -0000	1.14
  @@ -198,7 +198,7 @@
        */
       protected int generateNewId()
       {
  -        PBCapsule capsule = new PBCapsule(null, null);
  +        PBCapsule capsule = new PBCapsule(null, TxManagerFactory.instance().getTransaction());
           try
           {
           	ClassDescriptor cld = capsule.getBroker().getClassDescriptor(this.getClass());