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 Thu, 27 Oct 2005 18:20:20 GMT
arminw      2005/10/27 11:20:20

  Modified:    src/java/org/apache/ojb/odmg Tag: OJB_1_0_RELEASE
                        ObjectEnvelopeTable.java
  Log:
  fix problem with refresh object image call
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.32.2.24 +21 -3     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.23
  retrieving revision 1.32.2.24
  diff -u -r1.32.2.23 -r1.32.2.24
  --- ObjectEnvelopeTable.java	26 Sep 2005 16:35:56 -0000	1.32.2.23
  +++ ObjectEnvelopeTable.java	27 Oct 2005 18:20:20 -0000	1.32.2.24
  @@ -291,12 +291,12 @@
               while (iter.hasNext())
               {
                   ObjectEnvelope mod = (ObjectEnvelope) mhtObjectEnvelopes.get(iter.next());
  -                mod.refreshObjectImage();
                   if(needsCommit && (mod.getModificationState() != StateOldClean.getInstance()
                           || mod.getModificationState() != StateTransient.getInstance()))
                   {
                       mod.setModificationState(mod.getModificationState().markClean());
                   }
  +                mod.refreshObjectImage();
               }
           }
       }
  @@ -433,6 +433,24 @@
           return result;
       }
   
  +//    /**
  +//     * retrieve an objects ObjectEnvelope state from the hashtable.
  +//     * If no ObjectEnvelope is found, a new one is created and returned.
  +//     * @return the resulting ObjectEnvelope
  +//     */
  +//    public ObjectEnvelope get(RuntimeObject rtObj)
  +//    {
  +//        ObjectEnvelope result = getByIdentity(rtObj.getIdentity());
  +//        if (result == null)
  +//        {
  +//            result = new ObjectEnvelope(this, rtObj.getIdentity(), rtObj.getObj(), rtObj.isNew());
  +//            mhtObjectEnvelopes.put(rtObj.getIdentity(), result);
  +//            mvOrderOfIds.add(rtObj.getIdentity());
  +//            if (log.isDebugEnabled()) log.debug("register: " + result);
  +//        }
  +//        return result;
  +//    }
  +
       /**
        * Returns a String representation of this object
        */
  @@ -499,7 +517,7 @@
           then insert is mandatory, because the user could move unmaterialized
           collection proxy objects from one existing, which was deleted, to a new object.
In this case
           the proxy was materialized on deletion of the main object, but on performing
  -        the cascading insert the collection objects will be found assigned to the new object.
  +        the cascading insert the collection objects will be found and assigned to the new
object.
           */
           cascadeMarkedForDeletion();
           cascadeMarkedForInsert();
  @@ -568,7 +586,7 @@
   
               if(depObj != null)
               {
  -                // in any case we have to link the source object when the object is insert
  +                // in any case we have to link the source object when the object needs
insert
                   source.addLinkOneToOne(ord, false);
   
                   IndirectionHandler handler = ProxyHelper.getIndirectionHandler(depObj);
  
  
  

---------------------------------------------------------------------
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