Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/.hgtags	Fri May 31 10:26:20 2013 +0100
     1.2 +++ b/.hgtags	Mon Jun 17 11:11:48 2013 +0100
     1.3 @@ -214,3 +214,5 @@
     1.4  c8286839d0df04aba819ec4bef12b86babccf30e jdk8-b90
     1.5  8f7ffb296385f85a4a6d53f9f2d4a7b13a8fa1ff jdk8-b91
     1.6  717aa26f8e0a1c0e768aebb3a763aca56db0c83e jdk8-b92
     1.7 +8dc9d7ccbb2d77fd89bc321bb02e67c152aca257 jdk8-b93
     1.8 +22f5d7f261d9d61a953d2d9a53f2e9ce0ca361d1 jdk8-b94

     2.1 --- a/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java	Fri May 31 10:26:20 2013 +0100
     2.2 +++ b/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java	Mon Jun 17 11:11:48 2013 +0100
     2.3 @@ -147,6 +147,14 @@
     2.4              return ior.equals( other.ior ) ;
     2.5      }
     2.6  
     2.7 +    public int hashCode() {
     2.8 +        if (ior == null) {
     2.9 +            return 0;
    2.10 +        } else {
    2.11 +            return ior.hashCode();
    2.12 +        }
    2.13 +    }
    2.14 +
    2.15      /**
    2.16       * Returns a string representation of this stub. Returns the same string
    2.17       * for all stubs that represent the same remote object.

     3.1 --- a/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java	Fri May 31 10:26:20 2013 +0100
     3.2 +++ b/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java	Mon Jun 17 11:11:48 2013 +0100
     3.3 @@ -456,6 +456,10 @@
     3.4              return other instanceof TestBadServerIdHandler ;
     3.5          }
     3.6  
     3.7 +        public int hashCode() {
     3.8 +            return 1;
     3.9 +        }
    3.10 +
    3.11          public void handle( ObjectKey objectKey )
    3.12          {
    3.13          }
    3.14 @@ -519,6 +523,10 @@
    3.15              return other instanceof TestLegacyORBSocketFactory ;
    3.16          }
    3.17  
    3.18 +        public int hashCode() {
    3.19 +            return 1;
    3.20 +        }
    3.21 +
    3.22          public ServerSocket createServerSocket( String type, int port )
    3.23          {
    3.24              return null ;
    3.25 @@ -544,6 +552,10 @@
    3.26              return other instanceof TestORBSocketFactory ;
    3.27          }
    3.28  
    3.29 +        public int hashCode() {
    3.30 +            return 1;
    3.31 +        }
    3.32 +
    3.33          public void setORB(ORB orb)
    3.34          {
    3.35          }
    3.36 @@ -573,6 +585,10 @@
    3.37              return other instanceof TestIORToSocketInfo;
    3.38          }
    3.39  
    3.40 +        public int hashCode() {
    3.41 +            return 1;
    3.42 +        }
    3.43 +
    3.44          public List getSocketInfo(IOR ior)
    3.45          {
    3.46              return null;
    3.47 @@ -609,6 +625,10 @@
    3.48              return other instanceof TestContactInfoListFactory;
    3.49          }
    3.50  
    3.51 +        public int hashCode() {
    3.52 +            return 1;
    3.53 +        }
    3.54 +
    3.55          public void setORB(ORB orb) { }
    3.56  
    3.57          public CorbaContactInfoList create( IOR ior ) { return null; }
    3.58 @@ -869,6 +889,10 @@
    3.59              return other instanceof TestORBInitializer1 ;
    3.60          }
    3.61  
    3.62 +        public int hashCode() {
    3.63 +            return 1;
    3.64 +        }
    3.65 +
    3.66          public void pre_init( ORBInitInfo info )
    3.67          {
    3.68          }
    3.69 @@ -886,6 +910,10 @@
    3.70              return other instanceof TestORBInitializer2 ;
    3.71          }
    3.72  
    3.73 +        public int hashCode() {
    3.74 +            return 1;
    3.75 +        }
    3.76 +
    3.77          public void pre_init( ORBInitInfo info )
    3.78          {
    3.79          }
    3.80 @@ -954,6 +982,8 @@
    3.81          {
    3.82              return other instanceof TestAcceptor1 ;
    3.83          }
    3.84 +
    3.85 +        public int hashCode() { return 1; }
    3.86          public boolean initialize() { return true; }
    3.87          public boolean initialized() { return true; }
    3.88          public String getConnectionCacheType() { return "FOO"; }
    3.89 @@ -985,6 +1015,7 @@
    3.90          {
    3.91              return other instanceof TestAcceptor2 ;
    3.92          }
    3.93 +        public int hashCode() { return 1; }
    3.94          public boolean initialize() { return true; }
    3.95          public boolean initialized() { return true; }
    3.96          public String getConnectionCacheType() { return "FOO"; }

     4.1 --- a/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java	Fri May 31 10:26:20 2013 +0100
     4.2 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java	Mon Jun 17 11:11:48 2013 +0100
     4.3 @@ -151,7 +151,9 @@
     4.4      }
     4.5  
     4.6      // Constructor used for factory/utility cases
     4.7 -    public RepIdDelegator() {}
     4.8 +    public RepIdDelegator() {
     4.9 +        this(null);
    4.10 +    }
    4.11  
    4.12      // Constructor used by getIdFromString.  All non-static
    4.13      // RepositoryId methods will use the provided delegate.
    4.14 @@ -159,7 +161,7 @@
    4.15          this.delegate = _delegate;
    4.16      }
    4.17  
    4.18 -    private RepositoryId delegate;
    4.19 +    private final RepositoryId delegate;
    4.20  
    4.21      public String toString() {
    4.22          if (delegate != null)
    4.23 @@ -174,4 +176,12 @@
    4.24          else
    4.25              return super.equals(obj);
    4.26      }
    4.27 +
    4.28 +    public int hashCode() {
    4.29 +        if (delegate != null) {
    4.30 +            return delegate.hashCode();
    4.31 +        } else {
    4.32 +            return super.hashCode();
    4.33 +        }
    4.34 +    }
    4.35  }

     5.1 --- a/src/share/classes/sun/rmi/rmic/iiop/CompoundType.java	Fri May 31 10:26:20 2013 +0100
     5.2 +++ b/src/share/classes/sun/rmi/rmic/iiop/CompoundType.java	Mon Jun 17 11:11:48 2013 +0100
     5.3 @@ -32,6 +32,7 @@
     5.4  
     5.5  package sun.rmi.rmic.iiop;
     5.6  
     5.7 +import java.util.Arrays;
     5.8  import java.util.Vector;
     5.9  import sun.tools.java.Identifier;
    5.10  import sun.tools.java.ClassNotFound;
    5.11 @@ -1851,6 +1852,10 @@
    5.12              return false;
    5.13          }
    5.14  
    5.15 +        public int hashCode() {
    5.16 +            return getName().hashCode() ^ Arrays.hashCode(arguments);
    5.17 +        }
    5.18 +
    5.19          /**
    5.20           * Return a new Method object that is a legal combination of
    5.21           * this method object and another one.