[Zope-CVS] CVS: Products/AdaptableStorage - patches.py:1.4

[Shane Hathaway]

Update of /cvs-repository/Products/AdaptableStorage
In directory cvs.zope.org:/tmp/cvs-serv18988

Modified Files:
	patches.py 
Log Message:
In addition to reverting to copy when moving objects within the filesystem,
revert to copy when moving objects between databases.


=== Products/AdaptableStorage/patches.py 1.3 => 1.4 ===
--- Products/AdaptableStorage/patches.py:1.3	Fri Jan 10 13:31:08 2003
+++ Products/AdaptableStorage/patches.py	Wed Feb  5 14:44:00 2003
@@ -65,8 +65,9 @@
 def applySetObPatch():
     # Fall back to copying when move/rename is not possible.
     def _setOb(self, id, object):
-        if getattr(self, '_use_fixed_oids_', 0):
-            if object._p_oid is not None:
+        if object._p_oid is not None:
+            if (getattr(self, '_use_fixed_oids_', 0) or (
+                object._p_jar is not None and object._p_jar != self._p_jar)):
                 old = object
                 # Forget changes to the original object
                 old._p_changed = 0