Merge branch 'unstable' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole-ext into unstable

guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/ConnectionPermission.java

@@ -111,7 +111,7 @@ public class ConnectionPermission
         // If null identifier, equality depends on whether other identifier
         // is null
         if (identifier == null)
-            return other.identifier != null;
+            return other.identifier == null;
 
         // Otherwise, equality depends entirely on identifier
         return identifier.equals(other.identifier);

guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/UserPermission.java

@@ -106,7 +106,7 @@ public class UserPermission implements ObjectPermission<String> {
         // If null identifier, equality depends on whether other identifier
         // is null
         if (identifier == null)
-            return other.identifier != null;
+            return other.identifier == null;
 
         // Otherwise, equality depends entirely on identifier
         return identifier.equals(other.identifier);