You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ol...@apache.org on 2004/02/28 22:44:57 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/otm/states PersistentDeleted.java PersistentNewDeleted.java State.java
olegnitz 2004/02/28 13:44:57
Modified: src/java/org/apache/ojb/otm/core ConcreteEditingContext.java
src/java/org/apache/ojb/otm/states PersistentDeleted.java
PersistentNewDeleted.java State.java
Log:
Solved all problems discovered by Joerg Heinicke and even more :)
Revision Changes Path
1.36 +53 -44 db-ojb/src/java/org/apache/ojb/otm/core/ConcreteEditingContext.java
Index: ConcreteEditingContext.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/ConcreteEditingContext.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ConcreteEditingContext.java 28 Feb 2004 09:24:39 -0000 1.35
+++ ConcreteEditingContext.java 28 Feb 2004 21:44:57 -0000 1.36
@@ -160,11 +160,12 @@
public void insert(Identity oid, Object obj, int lock)
throws LockingException
{
- insertInternal(oid, obj, lock, true, false);
+ insertInternal(oid, obj, lock, true, false, false);
}
private ContextEntry insertInternal(Identity oid, Object newObj, int lock,
- boolean mainObject, boolean isDependent)
+ boolean mainObject, boolean isDependent,
+ boolean addBeforeLast)
throws LockingException
{
ContextEntry entry;
@@ -204,7 +205,7 @@
else
{
Object origObj = _pb.getObjectByIdentity(oid);
-
+
if (origObj == null)
{
if (mainObject || isDependent)
@@ -232,7 +233,14 @@
}
}
_objects.put(oid, entry);
- _order.add(oid);
+ if (addBeforeLast)
+ {
+ _order.add(_order.size() - 1, oid);
+ }
+ else
+ {
+ _order.add(oid);
+ }
}
else
{
@@ -296,7 +304,7 @@
{
ContextEntry entry;
- entry = insertInternal(oid, object, LockType.WRITE_LOCK, true, false);
+ entry = insertInternal(oid, object, LockType.WRITE_LOCK, true, false, false);
if (entry != null)
{
entry.state = entry.state.deletePersistent();
@@ -314,37 +322,37 @@
return (entry == null ? null : entry.object);
}
- /**
- * @see org.apache.ojb.otm.EditingContext#lookupState(Identity)
- */
- public State lookupState(Identity oid)
- throws LockingException
- {
- State retval = null;
- ContextEntry entry = (ContextEntry) _objects.get(oid);
- if (entry != null)
- {
- /**
- * possibly return a clone so we don't allow people to tweak states.
- */
- retval = entry.state;
- }
- return retval;
- }
-
- /**
- * @see org.apache.ojb.otm.EditingContext#setState(Identity, State)
- */
- public void setState(Identity oid, State state)
- {
- ContextEntry entry = (ContextEntry) _objects.get(oid);
- entry.state = state;
- }
-
- public Collection getAllObjectsInContext()
- {
- return _objects.values();
- }
+ /**
+ * @see org.apache.ojb.otm.EditingContext#lookupState(Identity)
+ */
+ public State lookupState(Identity oid)
+ throws LockingException
+ {
+ State retval = null;
+ ContextEntry entry = (ContextEntry) _objects.get(oid);
+ if (entry != null)
+ {
+ /**
+ * possibly return a clone so we don't allow people to tweak states.
+ */
+ retval = entry.state;
+ }
+ return retval;
+ }
+
+ /**
+ * @see org.apache.ojb.otm.EditingContext#setState(Identity, State)
+ */
+ public void setState(Identity oid, State state)
+ {
+ ContextEntry entry = (ContextEntry) _objects.get(oid);
+ entry.state = state;
+ }
+
+ public Collection getAllObjectsInContext()
+ {
+ return _objects.values();
+ }
//////////////////////////////////////////
// MaterializationListener interface
@@ -454,7 +462,7 @@
{
return;
}
-
+
removeCollectionProxyListeners();
ConnectionManagerIF connMan = _pb.serviceConnectionManager();
@@ -503,7 +511,7 @@
if (entry.handler == null) // materialized
{
- if (!state.needsDelete())
+ if (!state.isDeleted())
{
Object[][] origFields = (Object[][]) _checkpointed.get(oid);
Object[][] newFields = getFields(entry.object, true, !isCommit);
@@ -589,7 +597,7 @@
Identity oid = order[i];
ContextEntry entry = (ContextEntry) _objects.get(oid);
- if (entry.state.needsDelete())
+ if (entry.state.isDeleted())
{
countCascadeDeleted += doCascadeDelete(entry.object);
}
@@ -738,7 +746,7 @@
cntxRelObj = lookup(relOid);
if (cntxRelObj == null)
{
- insertInternal(relOid, relObj, lock, false, isDependent);
+ insertInternal(relOid, relObj, lock, false, isDependent, true);
}
else if (cntxRelObj != relObj)
{
@@ -800,7 +808,7 @@
cntxRelObj = lookup(relOid);
if (cntxRelObj == null)
{
- insertInternal(relOid, relObj, lock, false, isDependent);
+ insertInternal(relOid, relObj, lock, false, isDependent, false);
cntxRelObj = relObj;
}
else if (cntxRelObj != relObj)
@@ -1196,7 +1204,7 @@
+ oid + " is not in the editing context");
}
- if (entry.state.needsDelete())
+ if (entry.state.isDeleted())
{
return 0;
}
@@ -1259,7 +1267,8 @@
newObjects.add(newOid);
}
}
- else if ((origOid != null) && (newOid == null))
+ else if ((origOid != null) &&
+ ((newOid == null) || !newOid.equals(origOid)))
{
markDelete(origOid);
}
@@ -1507,7 +1516,7 @@
try
{
insertInternal(relOid, relObj, _lock, false,
- _cds.getOtmDependent());
+ _cds.getOtmDependent(), false);
}
catch (LockingException ex)
{
1.2 +4 -0 db-ojb/src/java/org/apache/ojb/otm/states/PersistentDeleted.java
Index: PersistentDeleted.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/states/PersistentDeleted.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PersistentDeleted.java 16 Mar 2003 18:13:06 -0000 1.1
+++ PersistentDeleted.java 28 Feb 2004 21:44:57 -0000 1.2
@@ -123,4 +123,8 @@
return true;
}
+ public boolean isDeleted()
+ {
+ return true;
+ }
}
1.2 +4 -0 db-ojb/src/java/org/apache/ojb/otm/states/PersistentNewDeleted.java
Index: PersistentNewDeleted.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/states/PersistentNewDeleted.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PersistentNewDeleted.java 16 Mar 2003 18:13:06 -0000 1.1
+++ PersistentNewDeleted.java 28 Feb 2004 21:44:57 -0000 1.2
@@ -111,4 +111,8 @@
return State.TRANSIENT;
}
+ public boolean isDeleted()
+ {
+ return true;
+ }
}
1.2 +8 -0 db-ojb/src/java/org/apache/ojb/otm/states/State.java
Index: State.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/states/State.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- State.java 16 Mar 2003 18:13:06 -0000 1.1
+++ State.java 28 Feb 2004 21:44:57 -0000 1.2
@@ -159,4 +159,12 @@
return false;
}
+ /**
+ * returns true is this state means that the object has been deleted
+ */
+ public boolean isDeleted()
+ {
+ return false;
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org