You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2011/04/02 00:09:29 UTC
svn commit: r1087916 - in
/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento:
Memento.java ObjectData.java
Author: rmatthews
Date: Fri Apr 1 22:09:29 2011
New Revision: 1087916
URL: http://svn.apache.org/viewvc?rev=1087916&view=rev
Log:
More fixes to memento
Modified:
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Memento.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/ObjectData.java
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Memento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Memento.java?rev=1087916&r1=1087915&r2=1087916&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Memento.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Memento.java Fri Apr 1 22:09:29 2011
@@ -263,6 +263,8 @@ public class Memento implements Serializ
PersistorUtil.end(object);
} else if (object.getResolveState() == ResolveState.TRANSIENT && resolveState == ResolveState.TRANSIENT) {
updateFields(object, state);
+ } else if (object.isAggregated()) {
+ updateFields(object, state);
} else {
final ObjectData od = (ObjectData) state;
if (od.containsField()) {
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/ObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/ObjectData.java?rev=1087916&r1=1087915&r2=1087916&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/ObjectData.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/ObjectData.java Fri Apr 1 22:09:29 2011
@@ -101,6 +101,7 @@ public class ObjectData extends Data {
As.OBJECT.writeTo(output);
output.writeEncodable(value);
} else if (value instanceof Null) {
+ As.NULL.writeTo(output);
// nothing to do; if read back corresponds to NO_ENTRY
} else {
As.STRING.writeTo(output);