diff --git a/.classpath b/.classpath index 9d42302..2eec862 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -38,5 +38,5 @@ - + diff --git a/pom.xml b/pom.xml index b2b554f..6dcb654 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user share-updates war - 2.6.1-SNAPSHOT + 2.6.2-SNAPSHOT gCube Share Updates Portlet gCube Share Updates for exchanging updates with other users of VREs. diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java index 4bc361f..dec0258 100644 --- a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java @@ -855,15 +855,19 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements Shar RoleManager rm = new LiferayRoleManager(); try { for (MentionedDTO mentioned : mentions) { - if (mentioned.getType().equalsIgnoreCase("user")) { - long userId = Long.parseLong(mentioned.id); - GCubeUser user = um.getUserById(userId); - toReturn.add(new ItemBean(user.getUserId()+"", user.getUsername(), user.getFullname(), user.getUserAvatarURL())); - } - else { //is a team - long teamId = Long.parseLong(mentioned.id); - GCubeTeam gCubeTeam = rm.getTeam(teamId); - toReturn.add(new ItemBean(gCubeTeam.getTeamId()+"", gCubeTeam.getTeamName())); + if (mentioned.id != null && mentioned.id.compareTo("") != 0) { //patch temporarely incident #13096 + if (mentioned.getType().equalsIgnoreCase("user")) { + long userId = Long.parseLong(mentioned.id); + GCubeUser user = um.getUserById(userId); + toReturn.add(new ItemBean(user.getUserId()+"", user.getUsername(), user.getFullname(), user.getUserAvatarURL())); + } + else { //is a team + long teamId = Long.parseLong(mentioned.id); + GCubeTeam gCubeTeam = rm.getTeam(teamId); + toReturn.add(new ItemBean(gCubeTeam.getTeamId()+"", gCubeTeam.getTeamName())); + } + } else { + _log.warn("getMentionsBean found empty mentioned.id for " + mentioned.toString()); } } } catch (Exception e) {