update
This commit is contained in:
@@ -3001,7 +3001,7 @@ public class DatabaseStore {
|
|||||||
rs = statement.executeQuery();
|
rs = statement.executeQuery();
|
||||||
while (rs.next()) {
|
while (rs.next()) {
|
||||||
|
|
||||||
String value = rs.getString(index++);
|
String value = rs.getString(1);
|
||||||
if (!StringUtil.isNullOrEmpty(value)) {
|
if (!StringUtil.isNullOrEmpty(value)) {
|
||||||
out.add(value);
|
out.add(value);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -305,20 +305,19 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
if (channelInfo != null) {
|
if (channelInfo != null) {
|
||||||
notifyReceivers.add(fromUser);
|
notifyReceivers.add(fromUser);
|
||||||
if (channelInfo.getOwner().equals(fromUser)) {
|
if (channelInfo.getOwner().equals(fromUser)) {
|
||||||
MultiMap<String, String> listeners = hzInstance.getMultiMap(CHANNEL_LISTENERS);
|
Collection<String> listeners = getChannelListener(message.getConversation().getTarget());
|
||||||
if (!StringUtil.isNullOrEmpty(message.getToUser())) {
|
if (!StringUtil.isNullOrEmpty(message.getToUser())) {
|
||||||
if (listeners.values().contains(message.getToUser())) {
|
if (listeners.contains(message.getToUser())) {
|
||||||
notifyReceivers.add(message.getToUser());
|
notifyReceivers.add(message.getToUser());
|
||||||
}
|
}
|
||||||
} else if(message.getToList() != null && !message.getToList().isEmpty()) {
|
} else if(message.getToList() != null && !message.getToList().isEmpty()) {
|
||||||
Collection<String> ls = listeners.get(message.getConversation().getTarget());
|
|
||||||
for (String to:message.getToList()) {
|
for (String to:message.getToList()) {
|
||||||
if (ls.contains(to)) {
|
if (listeners.contains(to)) {
|
||||||
notifyReceivers.add(to);
|
notifyReceivers.add(to);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
notifyReceivers.addAll(listeners.get(message.getConversation().getTarget()));
|
notifyReceivers.addAll(listeners);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (StringUtil.isNullOrEmpty(channelInfo.getCallback()) || channelInfo.getAutomatic() == 0) {
|
if (StringUtil.isNullOrEmpty(channelInfo.getCallback()) || channelInfo.getAutomatic() == 0) {
|
||||||
@@ -2614,6 +2613,8 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
|
HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
|
||||||
MultiMap<String, String> listeners = hzInstance.getMultiMap(CHANNEL_LISTENERS);
|
MultiMap<String, String> listeners = hzInstance.getMultiMap(CHANNEL_LISTENERS);
|
||||||
|
|
||||||
|
getChannelListener(channelId);
|
||||||
|
|
||||||
if (listen) {
|
if (listen) {
|
||||||
listeners.put(channelId, operator);
|
listeners.put(channelId, operator);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user