antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

Include node state in serialization and refuse to read earlier serialization versions.

Browse source
This commit is contained in:
hns 2003-07-08 16:15:02 +00:00
parent 4c94cba091
commit 672153dbfe
2 changed files with 11 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/helma/objectmodel/db/Node.java
View file

@ -184,68 +184,23 @@ public final class Node implements INode, Serializable {
String rawParentID = null; String rawParentID = null;
if (version < 8) { if (version < 9) {
id = in.readUTF(); throw new IOException("Can't read pre 1.3.0 HopObject");
name = in.readUTF();
} else {
id = (String) in.readObject();
name = (String) in.readObject();
}
if (version < 5) {
rawParentID = (String) in.readObject();
} else {
parentHandle = (NodeHandle) in.readObject();
} }
id = (String) in.readObject();
name = (String) in.readObject();
state = in.readInt();
parentHandle = (NodeHandle) in.readObject();
created = in.readLong(); created = in.readLong();
lastmodified = in.readLong(); lastmodified = in.readLong();
if (version < 4) {
// read away content and contentType, which were dropped
in.readObject();
in.readObject();
}
subnodes = (ExternalizableVector) in.readObject(); subnodes = (ExternalizableVector) in.readObject();
links = (ExternalizableVector) in.readObject(); links = (ExternalizableVector) in.readObject();
if (version < 6) {
// read away obsolete proplinks list
in.readObject();
}
propMap = (Hashtable) in.readObject(); propMap = (Hashtable) in.readObject();
anonymous = in.readBoolean(); anonymous = in.readBoolean();
prototype = (String) in.readObject();
if (version == 2) {
prototype = in.readUTF();
} else if (version >= 3) {
prototype = (String) in.readObject();
}
// if the input version is < 5, we have to do some conversion to make this object work
if (version < 5) {
if (rawParentID != null) {
parentHandle = new NodeHandle(new DbKey(null, rawParentID));
}
if (subnodes != null) {
for (int i = 0; i < subnodes.size(); i++) {
String s = (String) subnodes.get(i);
subnodes.set(i, new NodeHandle(new DbKey(null, s)));
}
}
if (links != null) {
for (int i = 0; i < links.size(); i++) {
String s = (String) links.get(i);
links.set(i, new NodeHandle(new DbKey(null, s)));
}
}
}
} catch (ClassNotFoundException x) { } catch (ClassNotFoundException x) {
throw new IOException(x.toString()); throw new IOException(x.toString());
} }
@ -255,9 +210,10 @@ public final class Node implements INode, Serializable {
* Write out this instance to a stream * Write out this instance to a stream
*/ */
private void writeObject(ObjectOutputStream out) throws IOException { private void writeObject(ObjectOutputStream out) throws IOException {
out.writeShort(8); // serialization version out.writeShort(9); // serialization version
out.writeObject(id); out.writeObject(id);
out.writeObject(name); out.writeObject(name);
out.writeInt(state);
out.writeObject(parentHandle); out.writeObject(parentHandle);
out.writeLong(created); out.writeLong(created);
out.writeLong(lastmodified); out.writeLong(lastmodified);

16
src/helma/objectmodel/db/Property.java
View file

@ -79,13 +79,7 @@ public final class Property implements IProperty, Serializable, Cloneable {
switch (type) { switch (type) {
case STRING: case STRING:
value = in.readObject();
// try to convert from old format
if (node.version < 7) {
value = in.readUTF();
} else {
value = in.readObject();
}
break; break;
@ -110,13 +104,7 @@ public final class Property implements IProperty, Serializable, Cloneable {
break; break;
case NODE: case NODE:
value = (NodeHandle) in.readObject();
// try to convert from old format
if (node.version > 4) {
value = (NodeHandle) in.readObject();
} else {
value = new NodeHandle(new DbKey(null, in.readUTF()));
}
break; break;