db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/odmg ObjectEnvelopeTable.java
Date Mon, 26 Sep 2005 16:35:56 GMT
arminw      2005/09/26 09:35:56

  Modified:    src/java/org/apache/ojb/odmg Tag: OJB_1_0_RELEASE
                        ObjectEnvelopeTable.java
  Log:
  fix bug: completely skip cascading insert for non-new objects
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.32.2.23 +1 -6      db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java
  
  Index: ObjectEnvelopeTable.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java,v
  retrieving revision 1.32.2.22
  retrieving revision 1.32.2.23
  diff -u -r1.32.2.22 -r1.32.2.23
  --- ObjectEnvelopeTable.java	9 Sep 2005 00:34:48 -0000	1.32.2.22
  +++ ObjectEnvelopeTable.java	26 Sep 2005 16:35:56 -0000	1.32.2.23
  @@ -595,13 +595,8 @@
                           {
                               getTransaction().lockAndRegister(rt, Transaction.WRITE, false,
getTransaction().getRegistrationList());
                               depMod = getByIdentity(oid);
  +                            cascadeInsertFor(depMod, alreadyPrepared);
                           }
  -                        if(depMod == null)
  -                        {
  -                            // should never occur
  -                            throw new RuntimeException("Unexpected behavior");
  -                        }
  -                        cascadeInsertFor(depMod, alreadyPrepared);
                       }
                   }
               }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message