Commit 3b4d1681 authored by Dave Cridland's avatar Dave Cridland

OF-1246 Address Guus's comments

parent 590a5746
CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID);
UPDATE ofVersion SET version = 25 WHERE name = 'openfire'; UPDATE ofVersion SET version = 25 WHERE name = 'openfire';
CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID);
UPDATE ofVersion SET version = 24 WHERE name = 'openfire'; UPDATE ofVersion SET version = 24 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofMucConversationLog ADD INDEX ofMucConvLog_msg_id (messageID);
UPDATE ofVersion SET version = 24 WHERE name = 'openfire'; UPDATE ofVersion SET version = 24 WHERE name = 'openfire';
\ No newline at end of file
CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID);
UPDATE ofVersion SET version = 24 WHERE name = 'openfire'; UPDATE ofVersion SET version = 24 WHERE name = 'openfire';
\ No newline at end of file
CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID);
UPDATE ofVersion SET version = 24 WHERE name = 'openfire'; UPDATE ofVersion SET version = 24 WHERE name = 'openfire';
\ No newline at end of file
CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID);
UPDATE ofVersion SET version = 24 WHERE name = 'openfire'; UPDATE ofVersion SET version = 24 WHERE name = 'openfire';
\ No newline at end of file
CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID);
UPDATE ofVersion SET version = 24 WHERE name = 'openfire'; UPDATE ofVersion SET version = 24 WHERE name = 'openfire';
\ No newline at end of file
...@@ -18,6 +18,7 @@ import org.jivesoftware.openfire.muc.MultiUserChatManager; ...@@ -18,6 +18,7 @@ import org.jivesoftware.openfire.muc.MultiUserChatManager;
import org.jivesoftware.openfire.muc.MultiUserChatService; import org.jivesoftware.openfire.muc.MultiUserChatService;
import org.jivesoftware.openfire.muc.NotAllowedException; import org.jivesoftware.openfire.muc.NotAllowedException;
import org.jivesoftware.util.JiveGlobals; import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.Log;
import org.jivesoftware.util.StringUtils; import org.jivesoftware.util.StringUtils;
import org.jivesoftware.util.XMPPDateTimeFormat; import org.jivesoftware.util.XMPPDateTimeFormat;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
...@@ -47,37 +48,37 @@ public class MucMamPersistenceManager implements PersistenceManager { ...@@ -47,37 +48,37 @@ public class MucMamPersistenceManager implements PersistenceManager {
private static final String ORDER_BY = " ORDER BY logTime"; private static final String ORDER_BY = " ORDER BY logTime";
@Override @Override
public boolean createMessage(ArchivedMessage message) { public boolean createMessage(ArchivedMessage message) {
return false; throw new UnsupportedOperationException("MAM-MUC cannot perform this operation");
} }
@Override @Override
public int processAllMessages(ArchivedMessageConsumer callback) { public int processAllMessages(ArchivedMessageConsumer callback) {
return 0; throw new UnsupportedOperationException("MAM-MUC cannot perform this operation");
} }
@Override @Override
public boolean createConversation(Conversation conversation) { public boolean createConversation(Conversation conversation) {
return false; throw new UnsupportedOperationException("MAM-MUC cannot perform this operation");
} }
@Override @Override
public boolean updateConversationEnd(Conversation conversation) { public boolean updateConversationEnd(Conversation conversation) {
return false; throw new UnsupportedOperationException("MAM-MUC cannot perform this operation");
} }
@Override @Override
public boolean createParticipant(Participant participant, Long conversationId) { public boolean createParticipant(Participant participant, Long conversationId) {
return false; throw new UnsupportedOperationException("MAM-MUC cannot perform this operation");
} }
@Override @Override
public List<Conversation> findConversations(String[] participants, Date startDate, Date endDate) { public List<Conversation> findConversations(String[] participants, Date startDate, Date endDate) {
return null; throw new UnsupportedOperationException("MAM-MUC cannot perform this operation");
} }
@Override @Override
public Collection<Conversation> findConversations(Date startDate, Date endDate, String owner, String with, XmppResultSet xmppResultSet) { public Collection<Conversation> findConversations(Date startDate, Date endDate, String owner, String with, XmppResultSet xmppResultSet) {
return null; throw new UnsupportedOperationException("MAM-MUC cannot perform this operation");
} }
@Override @Override
...@@ -159,7 +160,7 @@ public class MucMamPersistenceManager implements PersistenceManager { ...@@ -159,7 +160,7 @@ public class MucMamPersistenceManager implements PersistenceManager {
msgs.add(archivedMessage); msgs.add(archivedMessage);
} }
} catch (SQLException e) { } catch (SQLException e) {
// TODO ??? Log.error("SQL failure during MAM-MUC: ", e);
} finally { } finally {
DbConnectionManager.closeConnection(rs, pstmt, connection); DbConnectionManager.closeConnection(rs, pstmt, connection);
} }
...@@ -183,21 +184,21 @@ public class MucMamPersistenceManager implements PersistenceManager { ...@@ -183,21 +184,21 @@ public class MucMamPersistenceManager implements PersistenceManager {
@Override @Override
public Collection<Conversation> getActiveConversations(int conversationTimeout) { public Collection<Conversation> getActiveConversations(int conversationTimeout) {
return null; throw new UnsupportedOperationException("MAM-MUC cannot perform this operation");
} }
@Override @Override
public List<Conversation> getConversations(Collection<Long> conversationIds) { public List<Conversation> getConversations(Collection<Long> conversationIds) {
return null; throw new UnsupportedOperationException("MAM-MUC cannot perform this operation");
} }
@Override @Override
public Conversation getConversation(String ownerJid, String withJid, Date start) { public Conversation getConversation(String ownerJid, String withJid, Date start) {
return null; throw new UnsupportedOperationException("MAM-MUC cannot perform this operation");
} }
@Override @Override
public Conversation getConversation(Long conversationId) { public Conversation getConversation(Long conversationId) {
return null; throw new UnsupportedOperationException("MAM-MUC cannot perform this operation");
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment