Index: chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatTool.java =================================================================== --- chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatTool.java (revision 120) +++ chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatTool.java (revision 121) @@ -782,21 +782,16 @@ public String processActionDeleteRoomMessages() { try { - Placement placement = getToolManager().getCurrentPlacement(); - placementId = placement.getId(); + Placement placement = getToolManager().getCurrentPlacement(); + placementId = placement.getId(); - List rooms = getSiteChannels(); - int l = rooms.size(); - - if (l>1){ - //We only delete room (and its messages) if there are more than one - getChatManager().deleteChannelMessages(currentChannelEdit.getChatChannel()); - setCurrentChannelEdit(null); - } + getChatManager().deleteChannelMessages(currentChannelEdit.getChatChannel()); + setCurrentChannelEdit(null); - ChatChannel defaultChannel = getChatManager().getDefaultChannel(placement.getContext(), placement.getId()); - setCurrentChannel(new DecoratedChatChannel(this, defaultChannel)); - return PAGE_LIST_ROOMS; + ChatChannel defaultChannel = getChatManager().getDefaultChannel(placement.getContext(), placement.getId()); + setCurrentChannel(new DecoratedChatChannel(this, defaultChannel)); + + return PAGE_LIST_ROOMS; } catch (PermissionException e) { setErrorMessage(PERMISSION_ERROR, new String[] {ChatFunctions.CHAT_FUNCTION_DELETE_ANY});