safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Jumper
2013-02-13 02:57:58 -08:00
parent 25108c0a53 20bb937208
commit 8897ee7afe
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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