From 3dddfbc7018d46c41b113e9bba78dba513c6aa93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CHuy?= Date: Mon, 9 Dec 2024 15:10:54 +0000 Subject: [PATCH] #369 and #370 Clear Chat Room History Getting the room JID data from the correct resultset column in the loadFromDb method. --- src/java/org/jivesoftware/openfire/archive/ConversationDAO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/jivesoftware/openfire/archive/ConversationDAO.java b/src/java/org/jivesoftware/openfire/archive/ConversationDAO.java index 9338fe8f1..9900e71ac 100644 --- a/src/java/org/jivesoftware/openfire/archive/ConversationDAO.java +++ b/src/java/org/jivesoftware/openfire/archive/ConversationDAO.java @@ -261,7 +261,7 @@ private static Conversation loadFromDb(final long conversationID) throws NotFoun throw new NotFoundException("Conversation not found: " + conversationID); } final int roomID = rs.getInt(1); - final JID room = rs.getString(2) == null ? null : new JID(rs.getString(1)); + final JID room = rs.getString(2) == null ? null : new JID(rs.getString(2)); final boolean external = rs.getInt(3) == 1; final Date startDate = new Date(rs.getLong(4)); final Date lastActivity = new Date(rs.getLong(5));