Attachment #14927 for bug #34720

View | Details | Raw Unified | Return to bug 34720
Collapse All | Expand All

Lines 136-142 Link Here

(-)src/java/org/apache/lenya/ac/Identity.java (-1 / +1 lines)
136	if (identifiables[i] instanceof User) {	136	if (identifiables[i] instanceof User) {
137	User user = (User) identifiables[i];	137	User user = (User) identifiables[i];
138	User otherUser = manager.getUserManager().getUser(user.getId());	138	User otherUser = manager.getUserManager().getUser(user.getId());
139	belongs = belongs && user == otherUser;	139	belongs = belongs && user.equals(otherUser);
140	}	140	}
141	i++;	141	i++;
142	}	142	}




        assert (configurationDirectory != null) && configurationDirectory.isDirectory();
        this.configurationDirectory = configurationDirectory;
    }

    /**
     * @see java.lang.Object#equals(Object)
     */
    public boolean equals(Object otherObject) {
        boolean equals = false;

        if (getClass().isInstance(otherObject)) {
            FileUser other = (FileUser) otherObject;
            equals = (getConfigurationDirectory().equals(other.getConfigurationDirectory()) && 
                      getId().equals(other.getId()));
        }

        return equals;
    }
}

Return to bug 34720

Lines 201-205 Link Here

(-)src/java/org/apache/lenya/ac/file/FileUser.java (-1 / +15 lines)
201	assert (configurationDirectory != null) && configurationDirectory.isDirectory();	201	assert (configurationDirectory != null) && configurationDirectory.isDirectory();
202	this.configurationDirectory = configurationDirectory;	202	this.configurationDirectory = configurationDirectory;
203	}	203	}
204		204
		205	/**
		206	* @see java.lang.Object#equals(Object)
		207	*/
		208	public boolean equals(Object otherObject) {
		209	boolean equals = false;
		210
		211	if (getClass().isInstance(otherObject)) {
		212	FileUser other = (FileUser) otherObject;
		213	equals = (getConfigurationDirectory().equals(other.getConfigurationDirectory()) &&
		214	getId().equals(other.getId()));
		215	}
		216
		217	return equals;
		218	}
205	}	219	}