Author: ghjboss Date: 2010-02-09 12:59:42 -0500 (Tue, 09 Feb 2010) New Revision: 13898 Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main/org/jboss/portal/core/identity/UserActivity.java branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java Log: fix for JBEPP-159 Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main/org/jboss/portal/core/identity/UserActivity.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main/org/jboss/portal/core/identity/UserActivity.java 2010-02-09 16:58:02 UTC (rev 13897) +++ branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main/org/jboss/portal/core/identity/UserActivity.java 2010-02-09 17:59:42 UTC (rev 13898) @@ -70,8 +70,10 @@ { throw new IllegalArgumentException("Id (notification message) cannot be null"); } - this.id = notification.getMessage().substring(0, notification.getMessage().indexOf("_")); - this.sessionId = notification.getMessage().substring(notification.getMessage().indexOf("_")); + /************************ JBEPP-159 ****************************************************************************************************************************************************************************************/ + this.id = notification.getMessage().substring(0, notification.getMessage().indexOf(UsersActivityStatsServiceImpl.USERS_ACTIVITY_STATS_SEPARATOR)); + this.sessionId = notification.getMessage().substring(notification.getMessage().indexOf(UsersActivityStatsServiceImpl.USERS_ACTIVITY_STATS_SEPARATOR)+UsersActivityStatsServiceImpl.USERS_ACTIVITY_STATS_SEPARATOR.length()); + /***************************************************************************************************************************************************************************************************************************/ this.timestamp = notification.getTimeStamp(); this.type = Integer.parseInt(notification.getType()); } Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2010-02-09 16:58:02 UTC (rev 13897) +++ branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2010-02-09 17:59:42 UTC (rev 13898) @@ -54,7 +54,9 @@ { /** Our logger. */ private static final Logger log = Logger.getLogger(UsersActivityStatsServiceImpl.class); - + /***************************** JBEPP-159 ***********************************/ + public static final String USERS_ACTIVITY_STATS_SEPARATOR = "__SEPARATOR__"; + /***************************************************************************/ // TODO: some value just to begin - find some good default private int userTrackerThreadsNumber = 10; @@ -177,10 +179,11 @@ { try { + /****************** JBEPP-159 ***************************************************************************************/ Notification notification = new Notification(Integer.toString(userActivity.getType()), this.getServiceName(), - userActivity.getTimestamp(), userActivity.getTimestamp(), userActivity.getId() + "_" - + userActivity.getSessionId()); - + userActivity.getTimestamp(), userActivity.getTimestamp(), userActivity.getId() + USERS_ACTIVITY_STATS_SEPARATOR + + userActivity.getSessionId()); + /********************************************************************************************************************/ if (activityBroadcasterName != null) { log.debug("Broadcasting user activity notification ");