gCubeSystem
/
share-updates
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

patch temporarely incident #13096 

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/share-updates@176310 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2019-01-04 16:41:49 +00:00
parent a97a4dcf25
commit f4539947ac
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/share-updates-2.6.1-SNAPSHOT/WEB-INF/classes" path="src/main/java"> <classpathentry kind="src" output="target/share-updates-2.6.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/share-updates-2.6.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources"> <classpathentry excluding="**" kind="src" output="target/share-updates-2.6.2-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -38,5 +38,5 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/share-updates-2.6.1-SNAPSHOT/WEB-INF/classes"/> <classpathentry kind="output" path="target/share-updates-2.6.2-SNAPSHOT/WEB-INF/classes"/>
</classpath> </classpath>

2
pom.xml
View File

@ -13,7 +13,7 @@
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>share-updates</artifactId> <artifactId>share-updates</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>2.6.1-SNAPSHOT</version> <version>2.6.2-SNAPSHOT</version>
<name>gCube Share Updates Portlet</name> <name>gCube Share Updates Portlet</name>
<description> <description>
gCube Share Updates for exchanging updates with other users of VREs. gCube Share Updates for exchanging updates with other users of VREs.

4
src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
View File

@ -855,6 +855,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements Shar
RoleManager rm = new LiferayRoleManager(); RoleManager rm = new LiferayRoleManager();
try { try {
for (MentionedDTO mentioned : mentions) { for (MentionedDTO mentioned : mentions) {
if (mentioned.id != null && mentioned.id.compareTo("") != 0) { //patch temporarely incident #13096
if (mentioned.getType().equalsIgnoreCase("user")) { if (mentioned.getType().equalsIgnoreCase("user")) {
long userId = Long.parseLong(mentioned.id); long userId = Long.parseLong(mentioned.id);
GCubeUser user = um.getUserById(userId); GCubeUser user = um.getUserById(userId);
@ -865,6 +866,9 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements Shar
GCubeTeam gCubeTeam = rm.getTeam(teamId); GCubeTeam gCubeTeam = rm.getTeam(teamId);
toReturn.add(new ItemBean(gCubeTeam.getTeamId()+"", gCubeTeam.getTeamName())); toReturn.add(new ItemBean(gCubeTeam.getTeamId()+"", gCubeTeam.getTeamName()));
} }
} else {
_log.warn("getMentionsBean found empty mentioned.id for " + mentioned.toString());
}
} }
} catch (Exception e) { } catch (Exception e) {
_log.error("getMentionsBean Error: ", e); _log.error("getMentionsBean Error: ", e);