From 3b4f4c333f3a2d6c3057fe958914828ed059e2e5 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?C=C3=A9dric=20Cabessa?= <cedric.cabessa@uperto.com>
Date: Fri, 7 Mar 2008 10:46:30 +0100
Subject: [PATCH 1/1] Fix for FS103 Issue334

reapply Mathieu's patch with case fix
---
 client/xmlcrm/navi/mainNavi.lzx                    |    6 ++++++
 .../src/app/org/xmlcrm/app/remote/MainService.java |    5 ++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/client/xmlcrm/navi/mainNavi.lzx b/client/xmlcrm/navi/mainNavi.lzx
index 78c444a..a311069 100644
--- a/client/xmlcrm/navi/mainNavi.lzx
+++ b/client/xmlcrm/navi/mainNavi.lzx
@@ -236,10 +236,16 @@
         </handler>
         <labelText labelid="310" align="center" y="6" fontsize="14" />
         <handler name="onclick">
+            this.parent.logoutUser.doCall();
             quicklinkAct('logout');
         </handler>
 
     </view>
+    <netRemoteCallHib name="logoutUser" funcname="xmlcrm.logoutUser"
+        remotecontext="$once{ canvas.thishib }" activeErrorHandler="true" >
+        <netparam><method name="getValue"> return canvas.sessionId; </method></netparam>
+    </netRemoteCallHib> 
+
     <view name="btn2" width="120">
 
         <view name="v1b" width="$once{ parent.width-10 }"
diff --git a/webapp/src/app/org/xmlcrm/app/remote/MainService.java b/webapp/src/app/org/xmlcrm/app/remote/MainService.java
index b7c10e9..b38c55f 100644
--- a/webapp/src/app/org/xmlcrm/app/remote/MainService.java
+++ b/webapp/src/app/org/xmlcrm/app/remote/MainService.java
@@ -163,7 +163,10 @@ public class MainService implements IPendingServiceCallback {
      */
     public Long logoutUser(String SID){
     	Long users_id = Sessionmanagement.getInstance().checkSession(SID);
-    	return Usermanagement.getInstance().logout(SID,users_id);
+        IConnection current = Red5.getConnectionLocal();
+        RoomClient currentClient = (RoomClient) Application.getClientList().get(current.getClient().getId());
+        currentClient.setUserObject(null, null, null, null);
+        return Usermanagement.getInstance().logout(SID, users_id.longValue());
     }
     
     /**
-- 
1.5.4.1