You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ss...@apache.org on 2013/11/19 13:37:08 UTC
svn commit: r1543403 -
/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java
Author: ssievers
Date: Tue Nov 19 12:37:08 2013
New Revision: 1543403
URL: http://svn.apache.org/r1543403
Log:
SHINDIG-1946 | Implement logic in MessageHandler to delete a message collection | Patch from Andreas Kohn. Thanks!
Modified:
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java?rev=1543403&r1=1543402&r2=1543403&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java Tue Nov 19 12:37:08 2013
@@ -64,10 +64,13 @@ public class MessageHandler {
"A message collection is required");
}
- HandlerPreconditions.requireNotEmpty(messageIds, "No message IDs specified");
-
UserId user = request.getUsers().iterator().next();
+ if (messageIds == null || messageIds.isEmpty()) {
+ // MessageIds may be null if the complete collection should be deleted
+ return service.deleteMessageCollection(user, msgCollId, request.getToken());
+ }
+ // Delete specific messages
return service.deleteMessages(user, msgCollId, messageIds, request.getToken());
}