OF-677 - Monitoring Plugin - "Null" reappearing in Archive for Message Body

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

src/plugins/monitoring/changelog.html

@@ -44,6 +44,12 @@
 Monitoring Plugin Changelog
 </h1>
 
+<p><b>1.3.3</b> -- June 5, 2013</p>
+
+<ul>
+	<li>OF-677 - Monitoring Plugin - "Null" reappearing in Archive for Message Body.</li>
+</ul>
+
 <p><b>1.3.2-rc1</b> -- May 13, 2013</p>
 
 <ul>

src/plugins/monitoring/plugin.xml

@@ -5,8 +5,8 @@
     <name>Monitoring Service</name>
     <description>Monitors conversations and statistics of the server.</description>
     <author>Jive Software</author>
-    <version>1.3.2-beta1</version>
-    <date>05/13/2013</date>
+    <version>1.3.3</version>
+    <date>06/05/2013</date>
     <minServerVersion>3.6.0</minServerVersion>
     <databaseKey>monitoring</databaseKey>
     <databaseVersion>1</databaseVersion>

src/plugins/monitoring/src/java/org/jivesoftware/openfire/archive/ConversationManager.java

@@ -704,8 +704,11 @@ public class ConversationManager implements Startable, ComponentEventListener {
 				conversationQueue.add(conversation);
 			}
 			if (messageArchivingEnabled) {
+				if (body != null) {
+					/* OF-677 - Workaround to prevent null messages being archived */
 					messageQueue.add(new ArchivedMessage(conversation.getConversationID(), sender, receiver, date, body, false));
 				}
+			}
 			// Notify listeners of the conversation update.
 			for (ConversationListener listener : conversationListeners) {
 				listener.conversationUpdated(conversation, date);
@@ -763,8 +766,11 @@ public class ConversationManager implements Startable, ComponentEventListener {
 			}
 			if (roomArchivingEnabled && (roomsArchived.isEmpty() || roomsArchived.contains(roomJID.getNode()))) {
 				JID jid = new JID(roomJID + "/" + nickname);
+				if (body != null) {
+					/* OF-677 - Workaround to prevent null messages being archived */
 					messageQueue.add(new ArchivedMessage(conversation.getConversationID(), sender, jid, date, body, false));
 				}
+			}
 			// Notify listeners of the conversation update.
 			for (ConversationListener listener : conversationListeners) {
 				listener.conversationUpdated(conversation, date);