svn commit: r486655 - /incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java

[aadamchik]

Author: aadamchik
Date: Wed Dec 13 06:03:32 2006
New Revision: 486655

URL: http://svn.apache.org/viewvc?view=rev&rev=486655
Log:
CAY-721: DataContext shouldn't attempt to fix objects on FaultFailureExceptions
(and also a small javadocs fix)

Modified:
    
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java?view=diff&rev=486655&r1=486654&r2=486655
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
 Wed Dec 13 06:03:32 2006
@@ -39,7 +39,6 @@
 import org.apache.cayenne.DataRow;
 import org.apache.cayenne.DeleteDenyException;
 import org.apache.cayenne.Fault;
-import org.apache.cayenne.FaultFailureException;
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.PersistenceState;
@@ -96,9 +95,6 @@
  * Each DataObject can belong only to a single DataContext. To create a 
replica of an
  * object from a different DataContext in a local context, use
  * [EMAIL PROTECTED] #localObject(ObjectId, Persistent)} method.
- * <p>
- * <i>For more information see <a href="../../../../../../userguide/index.html"
- * target="_top">Cayenne User Guide. </a> </i>
  * </p>
  * 
  * @author Andrus Adamchik
@@ -1584,17 +1580,6 @@
             // call a setter to ensure EntityResolver is extracted from channel
             setChannel(Configuration.getSharedConfiguration().getDomain(
                     lazyInitParentDomainName));
-        }
-    }
-
-    public void prepareForAccess(Persistent object, String property, boolean 
lazyFaulting) {
-        try {
-            super.prepareForAccess(object, property, lazyFaulting);
-        }
-        catch (FaultFailureException e) {
-            // evict bad object
-            getObjectStore().processDeletedID(object.getObjectId());
-            throw e;
         }
     }