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

(-)java/org/apache/catalina/core/ApplicationTaglibDescriptor.java (-3 lines)
Lines 54-62 Link Here
54
        if (this == obj) {
54
        if (this == obj) {
55
            return true;
55
            return true;
56
        }
56
        }
57
        if (obj == null) {
58
            return false;
59
        }
60
        if (!(obj instanceof ApplicationTaglibDescriptor)) {
57
        if (!(obj instanceof ApplicationTaglibDescriptor)) {
61
            return false;
58
            return false;
62
        }
59
        }
(-)java/org/apache/catalina/deploy/LoginConfig.java (-2 lines)
Lines 195-202 Link Here
195
    public boolean equals(Object obj) {
195
    public boolean equals(Object obj) {
196
        if (this == obj)
196
        if (this == obj)
197
            return true;
197
            return true;
198
        if (obj == null)
199
            return false;
200
        if (!(obj instanceof LoginConfig))
198
        if (!(obj instanceof LoginConfig))
201
            return false;
199
            return false;
202
        LoginConfig other = (LoginConfig) obj;
200
        LoginConfig other = (LoginConfig) obj;
(-)java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (-1 lines)
Lines 353-359 Link Here
353
    
353
    
354
    @Override
354
    @Override
355
    public boolean equals(Object o) {
355
    public boolean equals(Object o) {
356
        if ( o == null ) return false;
357
        if ( !(o instanceof AbstractReplicatedMap)) return false;
356
        if ( !(o instanceof AbstractReplicatedMap)) return false;
358
        if ( !(o.getClass().equals(this.getClass())) ) return false;
357
        if ( !(o.getClass().equals(this.getClass())) ) return false;
359
        AbstractReplicatedMap other = (AbstractReplicatedMap)o;
358
        AbstractReplicatedMap other = (AbstractReplicatedMap)o;
(-)java/org/apache/el/parser/SimpleNode.java (-3 lines)
Lines 180-188 Link Here
180
        if (this == obj) {
180
        if (this == obj) {
181
            return true;
181
            return true;
182
        }
182
        }
183
        if (obj == null) {
184
            return false;
185
        }
186
        if (!(obj instanceof SimpleNode)) {
183
        if (!(obj instanceof SimpleNode)) {
187
            return false;
184
            return false;
188
        }
185
        }
(-)java/org/apache/naming/NamingEntry.java (-1 / +1 lines)
Lines 66-72 Link Here
66
66
67
    @Override
67
    @Override
68
    public boolean equals(Object obj) {
68
    public boolean equals(Object obj) {
69
        if ((obj != null) && (obj instanceof NamingEntry)) {
69
        if (obj instanceof NamingEntry) {
70
            return name.equals(((NamingEntry) obj).name);
70
            return name.equals(((NamingEntry) obj).name);
71
        } else {
71
        } else {
72
            return false;
72
            return false;
(-)java/org/apache/tomcat/util/net/URL.java (-2 lines)
Lines 304-311 Link Here
304
    @Override
304
    @Override
305
    public boolean equals(Object obj) {
305
    public boolean equals(Object obj) {
306
306
307
        if (obj == null)
308
            return (false);
309
        if (!(obj instanceof URL))
307
        if (!(obj instanceof URL))
310
            return (false);
308
            return (false);
311
        URL other = (URL) obj;
309
        URL other = (URL) obj;

Return to bug 50601