Fix for Monitoring Wrong JID Returned

LiamGregory · LiamGregory · commit 1e8f93110e4d · 2016-05-18T22:00:23.000+01:00
Changed so that correct JID is returned
diff --git a/src/plugins/monitoring/src/java/org/jivesoftware/openfire/archive/Conversation.java b/src/plugins/monitoring/src/java/org/jivesoftware/openfire/archive/Conversation.java
@@ -315,7 +315,7 @@ public List<ArchivedMessage> getMessages() {
 				JID toJID = new JID(rs.getString(3));
 				String toJIDResource = rs.getString(4);
 				if (toJIDResource != null && !"".equals(toJIDResource)) {
-					toJID = new JID(rs.getString(1) + "/" + toJIDResource);
+					toJID = new JID(rs.getString(3) + "/" + toJIDResource);
 				}
 				Date date = new Date(rs.getLong(5));
 				String body = DbConnectionManager.getLargeTextField(rs, 6);

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ public List<ArchivedMessage> getMessages() {`
`315`	`315`	`JID toJID = new JID(rs.getString(3));`
`316`	`316`	`String toJIDResource = rs.getString(4);`
`317`	`317`	`if (toJIDResource != null && !"".equals(toJIDResource)) {`
`318`		`- toJID = new JID(rs.getString(1) + "/" + toJIDResource);`
	`318`	`+ toJID = new JID(rs.getString(3) + "/" + toJIDResource);`
`319`	`319`	`}`
`320`	`320`	`Date date = new Date(rs.getLong(5));`
`321`	`321`	`String body = DbConnectionManager.getLargeTextField(rs, 6);`