Flush queued conversation log entries when the service is shutting down.

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@427 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/muc/spi/MUCPersistenceManager.java

@@ -725,7 +725,7 @@ public class MUCPersistenceManager {
             return true;
         }
         catch (SQLException sqle) {
-            Log.error(sqle);
+            Log.error("Error saving conversation log entry", sqle);
             return false;
         }
         finally {

src/java/org/jivesoftware/messenger/muc/spi/MultiUserChatServerImpl.java

@@ -242,6 +242,20 @@ public class MultiUserChatServerImpl extends BasicModule implements MultiUserCha
         }
     }
 
+    /**
+     * Logs all the remaining conversation log entries to the database. Use this method to force
+     * saving all the conversation log entries before the service becomes unavailable.
+     */
+    private void logAllConversation() {
+        ConversationLogEntry entry = null;
+        while (!logQueue.isEmpty()) {
+            entry = logQueue.poll();
+            if (entry != null) {
+                MUCPersistenceManager.saveConversationLogEntry(entry);
+            }
+        }
+    }
+
     public MUCRoom getChatRoom(String roomName, XMPPAddress userjid) throws UnauthorizedException {
         MUCRoom room = null;
         synchronized (rooms) {
@@ -550,6 +564,7 @@ public class MultiUserChatServerImpl extends BasicModule implements MultiUserCha
     public void stop() {
         super.stop();
         timer.cancel();
+        logAllConversation();
         if (registerHandler != null) {
             registerHandler.removeDelegate(getServiceName());
         }
@@ -802,6 +817,7 @@ public class MultiUserChatServerImpl extends BasicModule implements MultiUserCha
                 MUCRole role;
                 Element item;
                 for (Iterator<MUCRole> members = room.getOccupants(); members.hasNext();) {
+                    // TODO Should we filter occupants that are invisible (presence is not broadcasted)?
                     role = members.next();
                     item = DocumentHelper.createElement("item");
                     item.addAttribute("jid", role.getRoleAddress().toStringPrep());