Fri, 02 Nov 2012 17:54:44 -0700
Merge
1.1 --- a/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java Thu Nov 01 14:11:00 2012 -0700 1.2 +++ b/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java Fri Nov 02 17:54:44 2012 -0700 1.3 @@ -42,16 +42,6 @@ 1.4 * instead, it uses the System.identityHashcode() method and pointer comparison. 1.5 * In addition, all synchronization has been removed. 1.6 */ 1.7 -/** 1.8 - * IdentityHashtable collision list. 1.9 - */ 1.10 -class IdentityHashtableEntry { 1.11 - int hash; 1.12 - Object key; 1.13 - Object value; 1.14 - IdentityHashtableEntry next; 1.15 -} 1.16 - 1.17 public final class IdentityHashtable extends Dictionary { 1.18 /** 1.19 * The hash table data.
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEntry.java Fri Nov 02 17:54:44 2012 -0700 2.3 @@ -0,0 +1,43 @@ 2.4 +/* 2.5 + * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved. 2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 + * 2.8 + * This code is free software; you can redistribute it and/or modify it 2.9 + * under the terms of the GNU General Public License version 2 only, as 2.10 + * published by the Free Software Foundation. Oracle designates this 2.11 + * particular file as subject to the "Classpath" exception as provided 2.12 + * by Oracle in the LICENSE file that accompanied this code. 2.13 + * 2.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 2.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.17 + * version 2 for more details (a copy is included in the LICENSE file that 2.18 + * accompanied this code). 2.19 + * 2.20 + * You should have received a copy of the GNU General Public License version 2.21 + * 2 along with this work; if not, write to the Free Software Foundation, 2.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.23 + * 2.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.25 + * or visit www.oracle.com if you need additional information or have any 2.26 + * questions. 2.27 + */ 2.28 + 2.29 +/* 2.30 + * Licensed Materials - Property of IBM 2.31 + * RMI-IIOP v1.0 2.32 + * Copyright IBM Corp. 1998 1999 All Rights Reserved 2.33 + * 2.34 + */ 2.35 + 2.36 +package com.sun.corba.se.impl.util; 2.37 + 2.38 +/** 2.39 + * IdentityHashtable collision list. 2.40 + */ 2.41 +class IdentityHashtableEntry { 2.42 + int hash; 2.43 + Object key; 2.44 + Object value; 2.45 + IdentityHashtableEntry next; 2.46 +}