Return-Path: <arminw@apache.org>
Mailing-List: contact ojb-dev-help@db.apache.org; run by ezmlm
Delivered-To: mailing list ojb-dev@db.apache.org
Received: (qmail 8190 invoked by uid 500); 11 Apr 2003 22:02:21 -0000
Received: (qmail 8187 invoked from network); 11 Apr 2003 22:02:20 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 11 Apr 2003 22:02:20 -0000
Received: (qmail 69473 invoked by uid 1510); 11 Apr 2003 22:02:20 -0000
Date: 11 Apr 2003 22:02:20 -0000
Message-ID: <20030411220220.69472.qmail@icarus.apache.org>
From: arminw@apache.org
To: db-ojb-cvs@apache.org
Subject: cvs commit: db-ojb/src/java/org/apache/ojb/odmg/states
 ModificationState.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

arminw      2003/04/11 15:02:20

  Modified:    src/java/org/apache/ojb/odmg ObjectEnvelopeTable.java
               src/java/org/apache/ojb/odmg/states ModificationState.java
  Log:
  remove lines without effect
  
  Revision  Changes    Path
  1.22      +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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ObjectEnvelopeTable.java	25 Mar 2003 12:03:11 -0000	1.21
  +++ ObjectEnvelopeTable.java	11 Apr 2003 22:02:20 -0000	1.22
  @@ -199,7 +199,7 @@
               if (t instanceof OptimisticLockException)
               {
   	            // PB OptimisticLockException should be clearly signalled to the user
  -            	throw new LockNotGrantedException(t.getMessage());	
  +            	throw new LockNotGrantedException(t.getMessage());
               }
   			else
   			{
  @@ -226,11 +226,6 @@
               while (iter.hasNext())
               {
                   ObjectEnvelope mod = (ObjectEnvelope) mhtObjectEnvelopes.get(iter.next());
  -                // in a distributed environment all broker caches must invalidate modified Objects
  -                if (mod.needsDelete() || mod.needsInsert() || mod.needsUpdate())
  -                {
  -                    broker.invalidate(new Identity(mod.getObject(), transaction.getBroker()));
  -                }
                   mod.getModificationState().commit(mod, broker);
               }
           }
  
  
  
  1.5       +0 -1      db-ojb/src/java/org/apache/ojb/odmg/states/ModificationState.java
  
  Index: ModificationState.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/states/ModificationState.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ModificationState.java	24 Jan 2003 22:44:10 -0000	1.4
  +++ ModificationState.java	11 Apr 2003 22:02:20 -0000	1.5
  @@ -141,7 +141,6 @@
           try
           {
               broker.removeFromCache(objToBeRemoved);
  -            broker.invalidate(new Identity(objToBeRemoved, broker));
           }
           catch (PersistenceBrokerException e)
           {