Merge branch 'master' of https://github.com/igniterealtime/Openfire

src/java/org/jivesoftware/openfire/ldap/LdapManager.java

@@ -55,6 +55,7 @@ import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.JiveInitialLdapContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.xmpp.packet.JID;
 
 /**
  * Centralized administration of LDAP connections. The {@link #getInstance()} method
@@ -1920,7 +1921,7 @@ public class LdapManager {
                         result = result.substring(0,result.length()-suffixToTrim.length());
                     }
                     // Add this to the result.
-                    results.add(result);
+                    results.add(JID.escapeNode(result));
                 }
                 // Examine the paged results control response
                 Control[] controls = ctx.getResponseControls();
@@ -1977,7 +1978,7 @@ public class LdapManager {
                             result = result.substring(0,result.length()-suffixToTrim.length());
                         }
                         // Add this to the result.
-                        results.add(result);
+                        results.add(JID.escapeNode(result));
                     }
                     // Examine the paged results control response
                     Control[] controls = ctx2.getResponseControls();

src/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java

@@ -2088,7 +2088,7 @@ public class LocalMUCRoom implements MUCRoom {
      */
     private void kickPresence(Presence kickPresence, JID actorJID) {
         // Get the role(s) to kick
-        List<MUCRole> occupants = occupantsByNickname.get(kickPresence.getFrom().getResource().toLowerCase());
+        List<MUCRole> occupants = new ArrayList<MUCRole>(occupantsByNickname.get(kickPresence.getFrom().getResource().toLowerCase()));
         for (MUCRole kickedRole : occupants) {
             kickPresence = kickPresence.createCopy();
             // Add the actor's JID that kicked this user from the room

src/plugins/hazelcast/src/java/com/jivesoftware/util/cache/ClusteredCacheFactory.java

@@ -125,6 +125,7 @@ public class ClusteredCacheFactory implements CacheFactoryStrategy {
             try {
 	            Config config = new ClasspathXmlConfig(HAZELCAST_CONFIG_FILE);
 	            config.setInstanceName("openfire");
+                config.setClassLoader(loader);
 	            if (JMXManager.isEnabled() && HAZELCAST_JMX_ENABLED) {
 	            	config.setProperty("hazelcast.jmx", "true");
 	            	config.setProperty("hazelcast.jmx.detailed", "true");

src/web/group-summary.jsp

@@ -178,7 +178,7 @@ document.searchForm.search.focus();
             <%= i %>
         </td>
         <td width="60%">
-            <a href="group-edit.jsp?group=<%= URLEncoder.encode(groupName,"UTF-8") %>"><%= StringUtils.escapeHTMLTags(group.getName()) %></a>
+            <a href="group-edit.jsp?group=<%= groupName %>"><%= StringUtils.escapeHTMLTags(group.getName()) %></a>
             <% if (group.getDescription() != null) { %>
             <br>
                 <span class="jive-description">
@@ -195,12 +195,12 @@ document.searchForm.search.focus();
         <%  // Only show edit and delete options if the groups aren't read-only.
             if (!webManager.getGroupManager().isReadOnly()) { %>
         <td width="1%" align="center">
-            <a href="group-edit.jsp?group=<%= URLEncoder.encode(groupName,"UTF-8") %>"
+            <a href="group-edit.jsp?group=<%= groupName %>"
              title=<fmt:message key="global.click_edit" />
             ><img src="images/edit-16x16.gif" width="16" height="16" border="0" alt=""></a>
         </td>
         <td width="1%" align="center" style="border-right:1px #ccc solid;">
-            <a href="group-delete.jsp?group=<%= URLEncoder.encode(groupName,"UTF-8") %>"
+            <a href="group-delete.jsp?group=<%= groupName %>"
              title=<fmt:message key="global.click_delete" />
              ><img src="images/delete-16x16.gif" width="16" height="16" border="0" alt=""></a>
         </td>