Permalink
Browse files

XX-10394: IM user groups breaks OF synchronization

  • Loading branch information...
George Niculae
George Niculae committed Aug 27, 2012
1 parent 137f4e9 commit 2f11a2140b436e8e238eb07eca9cc63572ab8885
@@ -42,6 +42,7 @@
import org.sipfoundry.sipxconfig.feature.FeatureManager;
import org.sipfoundry.sipxconfig.imbot.ImBot;
import org.sipfoundry.sipxconfig.localization.LocalizationContext;
import org.sipfoundry.sipxconfig.setting.Group;
import org.springframework.beans.factory.annotation.Required;
public class OpenfireConfiguration implements ConfigProvider, DaoEventListener {
@@ -167,7 +168,7 @@ public void setSipxConfig(SipxOpenfireConfiguration sipxConfig) {
}
private void checkReplicate(Object entity) {
if (entity instanceof User || entity instanceof Conference) {
if (entity instanceof User || entity instanceof Conference || entity instanceof Group) {
m_configManager.configureEverywhere(OpenfireImpl.FEATURE);
try {
FileUtils.touch(new File(m_updateFile));
@@ -67,8 +67,9 @@ public void addMember(XmppGroupMember member) {
* @param administrator the administrator to set
*/
public void setAdministrator(String administrator) {
this.administrator = XmppAccountInfo.appendDomain(administrator);
if (administrator != null && !administrator.isEmpty()) {
this.administrator = XmppAccountInfo.appendDomain(administrator);
}
}
/**
@@ -763,11 +763,11 @@ public void update( XmppGroup group ) throws GroupAlreadyExistsException, GroupN
boolean isAllAdminGroup = false;
String adminJid = null;
JID adminJID = null;
if (group.getAdministrator() == null) {
isAllAdminGroup = true;
} else {
if (group.getAdministrator() != null && !group.getAdministrator().isEmpty()) {
adminJid = XmppAccountInfo.appendDomain(group.getAdministrator());
adminJID = new JID(adminJid);
} else {
isAllAdminGroup = true;
}

0 comments on commit 2f11a21

Please sign in to comment.