first message shown twice for new user issue solved
This commit is contained in:
parent
08f0160d8d
commit
7f88e20a88
|
@ -360,12 +360,15 @@ public class MessageManager extends Impersonable{
|
||||||
}
|
}
|
||||||
|
|
||||||
private void insertOrdered(List<Message> messages, Message toInsert) {
|
private void insertOrdered(List<Message> messages, Message toInsert) {
|
||||||
if (messages.isEmpty()) messages.add(toInsert);
|
if (messages.isEmpty())
|
||||||
int i;
|
messages.add(toInsert);
|
||||||
for ( i=0 ; i<messages.size(); i++)
|
else {
|
||||||
if (messages.get(i).getCreationTime().getTimeInMillis()<=toInsert.getCreationTime().getTimeInMillis())
|
int i;
|
||||||
break;
|
for ( i=0 ; i<messages.size(); i++)
|
||||||
messages.add(i, toInsert);
|
if (messages.get(i).getCreationTime().getTimeInMillis()<=toInsert.getCreationTime().getTimeInMillis())
|
||||||
|
break;
|
||||||
|
messages.add(i, toInsert);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -373,7 +376,7 @@ public class MessageManager extends Impersonable{
|
||||||
Node personalNode = null;
|
Node personalNode = null;
|
||||||
Node messageNode = (Node) messageItem.getRelatedNode();
|
Node messageNode = (Node) messageItem.getRelatedNode();
|
||||||
if (messageNode.getPath().startsWith(pathUtil.getWorkspacePath(currentUser).toPath()))
|
if (messageNode.getPath().startsWith(pathUtil.getWorkspacePath(currentUser).toPath()))
|
||||||
return messageNode;
|
return messageNode;
|
||||||
|
|
||||||
NodeIterator nodeIt = messageNode.getSharedSet();
|
NodeIterator nodeIt = messageNode.getSharedSet();
|
||||||
while (nodeIt.hasNext()) {
|
while (nodeIt.hasNext()) {
|
||||||
|
|
Loading…
Reference in New Issue