1 files changed, 4 insertions, 20 deletions

diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
index 980a10228e..8070b4b36f 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
@@ -12,17 +12,16 @@ package org.eclipse.net4j.internal.buddies.protocol;
 
 import org.eclipse.net4j.IChannel;
 import org.eclipse.net4j.buddies.IBuddySession;
+import org.eclipse.net4j.buddies.protocol.AccountUtil;
 import org.eclipse.net4j.buddies.protocol.BuddiesProtocolConstants;
 import org.eclipse.net4j.buddies.protocol.IBuddyAccount;
 import org.eclipse.net4j.internal.buddies.BuddySession;
 import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.WrappedException;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
 
 import java.io.IOException;
-import java.io.ObjectInputStream;
 
 /**
  * @author Eike Stepper
@@ -56,14 +55,15 @@ public class OpenSessionRequest extends RequestWithConfirmation<IBuddySession>
   @Override
   protected IBuddySession confirming(ExtendedDataInputStream in) throws IOException
   {
-    boolean granted = in.readBoolean();
-    if (!granted)
+    IBuddyAccount account = AccountUtil.readAccount(in);
+    if (account == null)
     {
       return null;
     }
 
     BuddySession session = new BuddySession(getProtocol().getChannel());
     getProtocol().setInfraStructure(session);
+    session.setSelf(account);
 
     int size = in.readInt();
     for (int i = 0; i < size; i++)
@@ -71,22 +71,6 @@ public class OpenSessionRequest extends RequestWithConfirmation<IBuddySession>
       session.addBuddy(in.readString());
     }
 
-    IBuddyAccount account;
-    ObjectInputStream ois = new ObjectInputStream(in);
-    try
-    {
-      account = (IBuddyAccount)ois.readObject();
-    }
-    catch (IOException ex)
-    {
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-
-    session.setSelf(account);
     LifecycleUtil.activate(session);
     return session;
   }