Mercurial > hg > openjdk > jdk8 > corba
changeset 482:c1f80e733eb0
Merge
author | chegar |
---|---|
date | Mon, 17 Jun 2013 11:11:48 +0100 |
parents | 25e68d232c20 (current diff) 0fac0a9d9545 (diff) |
children | d406edd4f6fd |
files | src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java |
diffstat | 5 files changed, 58 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri May 31 10:26:20 2013 +0100 +++ b/.hgtags Mon Jun 17 11:11:48 2013 +0100 @@ -214,3 +214,5 @@ c8286839d0df04aba819ec4bef12b86babccf30e jdk8-b90 8f7ffb296385f85a4a6d53f9f2d4a7b13a8fa1ff jdk8-b91 717aa26f8e0a1c0e768aebb3a763aca56db0c83e jdk8-b92 +8dc9d7ccbb2d77fd89bc321bb02e67c152aca257 jdk8-b93 +22f5d7f261d9d61a953d2d9a53f2e9ce0ca361d1 jdk8-b94
--- a/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java Fri May 31 10:26:20 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java Mon Jun 17 11:11:48 2013 +0100 @@ -147,6 +147,14 @@ return ior.equals( other.ior ) ; } + public int hashCode() { + if (ior == null) { + return 0; + } else { + return ior.hashCode(); + } + } + /** * Returns a string representation of this stub. Returns the same string * for all stubs that represent the same remote object.
--- a/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java Fri May 31 10:26:20 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java Mon Jun 17 11:11:48 2013 +0100 @@ -456,6 +456,10 @@ return other instanceof TestBadServerIdHandler ; } + public int hashCode() { + return 1; + } + public void handle( ObjectKey objectKey ) { } @@ -519,6 +523,10 @@ return other instanceof TestLegacyORBSocketFactory ; } + public int hashCode() { + return 1; + } + public ServerSocket createServerSocket( String type, int port ) { return null ; @@ -544,6 +552,10 @@ return other instanceof TestORBSocketFactory ; } + public int hashCode() { + return 1; + } + public void setORB(ORB orb) { } @@ -573,6 +585,10 @@ return other instanceof TestIORToSocketInfo; } + public int hashCode() { + return 1; + } + public List getSocketInfo(IOR ior) { return null; @@ -609,6 +625,10 @@ return other instanceof TestContactInfoListFactory; } + public int hashCode() { + return 1; + } + public void setORB(ORB orb) { } public CorbaContactInfoList create( IOR ior ) { return null; } @@ -869,6 +889,10 @@ return other instanceof TestORBInitializer1 ; } + public int hashCode() { + return 1; + } + public void pre_init( ORBInitInfo info ) { } @@ -886,6 +910,10 @@ return other instanceof TestORBInitializer2 ; } + public int hashCode() { + return 1; + } + public void pre_init( ORBInitInfo info ) { } @@ -954,6 +982,8 @@ { return other instanceof TestAcceptor1 ; } + + public int hashCode() { return 1; } public boolean initialize() { return true; } public boolean initialized() { return true; } public String getConnectionCacheType() { return "FOO"; } @@ -985,6 +1015,7 @@ { return other instanceof TestAcceptor2 ; } + public int hashCode() { return 1; } public boolean initialize() { return true; } public boolean initialized() { return true; } public String getConnectionCacheType() { return "FOO"; }
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java Fri May 31 10:26:20 2013 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java Mon Jun 17 11:11:48 2013 +0100 @@ -151,7 +151,9 @@ } // Constructor used for factory/utility cases - public RepIdDelegator() {} + public RepIdDelegator() { + this(null); + } // Constructor used by getIdFromString. All non-static // RepositoryId methods will use the provided delegate. @@ -159,7 +161,7 @@ this.delegate = _delegate; } - private RepositoryId delegate; + private final RepositoryId delegate; public String toString() { if (delegate != null) @@ -174,4 +176,12 @@ else return super.equals(obj); } + + public int hashCode() { + if (delegate != null) { + return delegate.hashCode(); + } else { + return super.hashCode(); + } + } }
--- a/src/share/classes/sun/rmi/rmic/iiop/CompoundType.java Fri May 31 10:26:20 2013 +0100 +++ b/src/share/classes/sun/rmi/rmic/iiop/CompoundType.java Mon Jun 17 11:11:48 2013 +0100 @@ -32,6 +32,7 @@ package sun.rmi.rmic.iiop; +import java.util.Arrays; import java.util.Vector; import sun.tools.java.Identifier; import sun.tools.java.ClassNotFound; @@ -1851,6 +1852,10 @@ return false; } + public int hashCode() { + return getName().hashCode() ^ Arrays.hashCode(arguments); + } + /** * Return a new Method object that is a legal combination of * this method object and another one.