Commit f257c482 authored by Brian Major's avatar Brian Major
Browse files

s1890 - reverted isConsistent() changes

parent 812546bc

cadcAccessControl/src/ca/nrc/cadc/ac/User.java

+8 −7
Original line number Original line Diff line number Diff line
@@ -155,22 +155,23 @@ public class User 
            return false;

            return false;

        }

        }





        if (this.equals(other))

        {

            return true;

        }



        for (Principal identity: getIdentities())

        for (Principal identity: getIdentities())

        {

        {

            boolean found = false;

            for (Principal op: other.getIdentities())

            for (Principal op: other.getIdentities())

            {

            {

                if (op.equals(identity))

                if (op.equals(identity))

                {

                {

                    return true;

                    found = true;

                    break;

                }

                }

            }

            }

            if (!found)

            {

                return false;

            }

        }

        }

        return false;

        return true;

    }

    }





    /* (non-Javadoc)

    /* (non-Javadoc)