# HG changeset patch # User lana # Date 1351904084 25200 # Node ID f0b6a25db9f2d9aeaaf88e70710e5356eed09c28 # Parent b4742fb981caa3a78b1cb21b0e7f0d5ec51f0a82# Parent e4035d400754004100cf8bf9d219987d78faa343 Merge diff -r b4742fb981ca -r f0b6a25db9f2 corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java --- a/corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java Thu Nov 01 14:11:00 2012 -0700 +++ b/corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java Fri Nov 02 17:54:44 2012 -0700 @@ -42,16 +42,6 @@ * instead, it uses the System.identityHashcode() method and pointer comparison. * In addition, all synchronization has been removed. */ -/** - * IdentityHashtable collision list. - */ -class IdentityHashtableEntry { - int hash; - Object key; - Object value; - IdentityHashtableEntry next; -} - public final class IdentityHashtable extends Dictionary { /** * The hash table data. diff -r b4742fb981ca -r f0b6a25db9f2 corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEntry.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEntry.java Fri Nov 02 17:54:44 2012 -0700 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * Licensed Materials - Property of IBM + * RMI-IIOP v1.0 + * Copyright IBM Corp. 1998 1999 All Rights Reserved + * + */ + +package com.sun.corba.se.impl.util; + +/** + * IdentityHashtable collision list. + */ +class IdentityHashtableEntry { + int hash; + Object key; + Object value; + IdentityHashtableEntry next; +}