Update of /var/cvs/src/org/mmbase/security
In directory james.mmbase.org:/tmp/cvs-serv4973
Modified Files:
BasicUser.java
Log Message:
Thanks to martin.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/security
Index: BasicUser.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/security/BasicUser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- BasicUser.java 13 Aug 2008 08:09:53 -0000 1.8
+++ BasicUser.java 12 Nov 2008 13:42:10 -0000 1.9
@@ -23,7 +23,7 @@
* although this is possible.
*
* @author Eduard Witteveen
- * @version $Id: BasicUser.java,v 1.8 2008/08/13 08:09:53 michiel Exp $
+ * @version $Id: BasicUser.java,v 1.9 2008/11/12 13:42:10 michiel Exp $
*/
public class BasicUser implements UserContext, Comparable<Object> {
private static final Logger log =
Logging.getLoggerInstance(BasicUser.class);
@@ -98,8 +98,8 @@
BasicUser ou = (BasicUser) o;
return
(authenticationType == null ? ou.authenticationType == null :
authenticationType.equals(ou.authenticationType)) &&
- getIdentifier() == null ? ou.getIdentifier() == null :
getIdentifier().equals(ou.getIdentifier()) &&
- getRank() == null ? ou.getRank() == null :
getRank().equals(ou.getRank());
+ (getIdentifier() == null ? ou.getIdentifier() == null :
getIdentifier().equals(ou.getIdentifier())) &&
+ (getRank() == null ? ou.getRank() == null :
getRank().equals(ou.getRank()));
} else {
return false;
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
