Commit 977c9ac6 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Fixed deserialization of Groups.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9369 b35dd754-fafc-0310-a699-88a17e54d16e
parent 96499246
......@@ -270,16 +270,6 @@ public class Group implements Cacheable, Externalizable {
}
}
private void writeObject(java.io.ObjectOutputStream out) throws IOException {
out.defaultWriteObject();
}
private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
groupManager = GroupManager.getInstance();
provider = groupManager.getProvider();
}
public int getCachedSize() {
// Approximate the size of the object in bytes by calculating the size
// of each field.
......@@ -624,6 +614,9 @@ public class Group implements Cacheable, Externalizable {
}
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
groupManager = GroupManager.getInstance();
provider = groupManager.getProvider();
name = ExternalizableUtil.getInstance().readSafeUTF(in);
if (ExternalizableUtil.getInstance().readBoolean(in)) {
description = ExternalizableUtil.getInstance().readSafeUTF(in);
......
......@@ -173,7 +173,7 @@
}
catch (Exception e) {
Log.debug("Problem adding new user to existing group", e);
Log.warn("Problem adding new user to existing group", e);
errorBuf.append("<br>").append(
LocaleUtils.getLocalizedString("group.edit.inexistent_user", Arrays.asList(username)));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment