HADOOP-7208. Fix implementation of equals() and hashCode() in StandardSocketFactory. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1129840 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
0317cf74cd
commit
b0c968e2b9
@ -258,6 +258,9 @@ Trunk (unreleased changes)
|
|||||||
HADOOP-7282. ipc.Server.getRemoteIp() may return null. (John George
|
HADOOP-7282. ipc.Server.getRemoteIp() may return null. (John George
|
||||||
via szetszwo)
|
via szetszwo)
|
||||||
|
|
||||||
|
HADOOP-7208. Fix implementation of equals() and hashCode() in
|
||||||
|
StandardSocketFactory. (Uma Maheswara Rao G via todd)
|
||||||
|
|
||||||
Release 0.22.0 - Unreleased
|
Release 0.22.0 - Unreleased
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
@ -112,16 +112,13 @@ public boolean equals(Object obj) {
|
|||||||
return true;
|
return true;
|
||||||
if (obj == null)
|
if (obj == null)
|
||||||
return false;
|
return false;
|
||||||
if (!(obj instanceof StandardSocketFactory))
|
return obj.getClass().equals(this.getClass());
|
||||||
return false;
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* @inheritDoc */
|
/* @inheritDoc */
|
||||||
@Override
|
@Override
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
// Dummy hash code (to make find bugs happy)
|
return this.getClass().hashCode();
|
||||||
return 47;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
71
src/test/core/org/apache/hadoop/ipc/TestSocketFactory.java
Normal file
71
src/test/core/org/apache/hadoop/ipc/TestSocketFactory.java
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
/**
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
* or more contributor license agreements. See the NOTICE file
|
||||||
|
* distributed with this work for additional information
|
||||||
|
* regarding copyright ownership. The ASF licenses this file
|
||||||
|
* to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.apache.hadoop.ipc;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertSame;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import javax.net.SocketFactory;
|
||||||
|
|
||||||
|
import junit.framework.Assert;
|
||||||
|
|
||||||
|
import org.apache.hadoop.conf.Configuration;
|
||||||
|
import org.apache.hadoop.net.NetUtils;
|
||||||
|
import org.apache.hadoop.net.StandardSocketFactory;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
public class TestSocketFactory {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSocketFactoryAsKeyInMap() throws Exception {
|
||||||
|
Map<SocketFactory, Integer> dummyCache = new HashMap<SocketFactory, Integer>();
|
||||||
|
int toBeCached1 = 1;
|
||||||
|
int toBeCached2 = 2;
|
||||||
|
Configuration conf = new Configuration();
|
||||||
|
conf.set("hadoop.rpc.socket.factory.class.default",
|
||||||
|
"org.apache.hadoop.ipc.TestSocketFactory$DummySocketFactory");
|
||||||
|
final SocketFactory dummySocketFactory = NetUtils
|
||||||
|
.getDefaultSocketFactory(conf);
|
||||||
|
dummyCache.put(dummySocketFactory, toBeCached1);
|
||||||
|
|
||||||
|
conf.set("hadoop.rpc.socket.factory.class.default",
|
||||||
|
"org.apache.hadoop.net.StandardSocketFactory");
|
||||||
|
final SocketFactory defaultSocketFactory = NetUtils
|
||||||
|
.getDefaultSocketFactory(conf);
|
||||||
|
dummyCache.put(defaultSocketFactory, toBeCached2);
|
||||||
|
|
||||||
|
Assert
|
||||||
|
.assertEquals("The cache contains two elements", 2, dummyCache.size());
|
||||||
|
Assert.assertEquals("Equals of both socket factory shouldn't be same",
|
||||||
|
defaultSocketFactory.equals(dummySocketFactory), false);
|
||||||
|
|
||||||
|
assertSame(toBeCached2, dummyCache.remove(defaultSocketFactory));
|
||||||
|
dummyCache.put(defaultSocketFactory, toBeCached2);
|
||||||
|
assertSame(toBeCached1, dummyCache.remove(dummySocketFactory));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A dummy socket factory class that extends the StandardSocketFactory.
|
||||||
|
*/
|
||||||
|
static class DummySocketFactory extends StandardSocketFactory {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user