Merge pull request #73 from Redor/openfire

Fixed: org.xmpp.packet.JID and JID String was mixed up.

src/java/org/jivesoftware/openfire/clearspace/ClearspaceMUCTranscriptManager.java

@@ -281,7 +281,7 @@ public class ClearspaceMUCTranscriptManager implements MUCEventListener {
         MultiUserChatService chatService =
                 XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatService(roomJID);
         MUCRoom room = chatService.getChatRoom(roomJID.getNode());
-        return room != null && room.getOwners().contains(user.toBareJID());
+        return room != null && room.getOwners().contains(user);
     }
 
     private boolean isClearspaceRoom(JID roomJID) {

src/java/org/jivesoftware/openfire/pep/PEPServiceManager.java

@@ -216,7 +216,7 @@ public class PEPServiceManager {
 	}
 	
 	public boolean hasCachedService(JID owner) {
-		return pepServices.get(owner) != null;
+		return pepServices.get(owner.toBareJID()) != null;
 	}
 	
 	// mimics Shutdown, without killing the timer.

src/java/org/jivesoftware/openfire/pubsub/models/PresenceAccess.java

@@ -54,7 +54,7 @@ public class PresenceAccess extends AccessModel {
         XMPPServer server = XMPPServer.getInstance();
         for (JID nodeOwner : node.getOwners()) {
 	        // Give access to the owner of the roster :)
-	        if (nodeOwner.equals(owner.toBareJID())) {
+	        if (nodeOwner.equals(owner)) {
 	            return true;
 	        }
 	        // Check that the node owner is a local user