Merge OpenOLAT default branch to OpenOLAT 9.0a with 2fa92bb6678389f0d49b6b6863697ffc437a291c

src/main/java/org/olat/admin/sysinfo/UserSessionController.java

@@ -159,12 +159,13 @@ public class UserSessionController extends BasicController implements StackedCon
 				TableEvent te = (TableEvent)event;
 				int selRow = te.getRowId();
 				// session info (we only have authenticated sessions here
-				UserSession usess = (UserSession) tableCtr.getTableDataModel().getObject(selRow);
+				UserSessionView usessw = (UserSessionView)tableCtr.getTableDataModel().getObject(selRow);
 				if("sess.chat".equals(te.getActionId())) {
-					Buddy buddy = imService.getBuddyById(usess.getIdentity().getKey());
+					Buddy buddy = imService.getBuddyById(usessw.getIdentityKey());
 					OpenInstantMessageEvent e = new OpenInstantMessageEvent(ureq, buddy);
 					ureq.getUserSession().getSingleUserEventCenter().fireEventToListenersOf(e, InstantMessagingService.TOWER_EVENT_ORES);
 				} else if("sess.details".equals(te.getActionId())) {
+					UserSession usess = usessw.getUserSession();
 					UserSessionDetailsController detailsCtrl = new UserSessionDetailsController(ureq, getWindowControl(), usess);
 					listenTo(detailsCtrl);
 					

src/main/java/org/olat/admin/sysinfo/model/UserSessionView.java

@@ -21,7 +21,11 @@ public class UserSessionView {
 	private long sessionDuration;
 	private String mode;
 	
+	private UserSession userSession;
+	
 	public UserSessionView(UserSession usess) {
+		userSession = usess;
+		
 		SessionInfo sessInfo = usess.getSessionInfo();
 		authenticated = usess.isAuthenticated();
 		if (authenticated) {
@@ -54,6 +58,10 @@ public class UserSessionView {
 		}
 	}
 	
+	public UserSession getUserSession() {
+		return userSession;
+	}
+	
 	public boolean isAuthenticated() {
 		return authenticated;	
 	}