# HG changeset patch # User lana # Date 1404250198 25200 # Node ID 8c0fc025c0f30b24331f1a05c2116b2f633e68ec # Parent 28dd0c7beb3cad9cf95f17b4b5ad87eb447a4084# Parent 1d2051494df4e71184fe5aac4de968cc9eb0124d Merge diff -r 28dd0c7beb3c -r 8c0fc025c0f3 corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java --- a/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Wed Jul 05 19:47:10 2017 +0200 +++ b/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Tue Jul 01 14:29:58 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, 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 @@ -35,7 +35,8 @@ import java.io.OutputStream; import java.io.ObjectOutputStream; import java.io.ObjectOutput; -import java.util.Hashtable; +import java.util.Map; +import java.util.HashMap; import org.omg.CORBA.INTERNAL; @@ -49,7 +50,7 @@ */ private class HookPutFields extends ObjectOutputStream.PutField { - private Hashtable fields = new Hashtable(); + private Map fields = new HashMap<>(); /** * Put the value of the named boolean field into the persistent field. @@ -140,7 +141,6 @@ public OutputStreamHook() throws java.io.IOException { super(); - } public void defaultWriteObject() throws IOException {