Merge

Fri, 24 Oct 2014 17:05:18 -0700

author
asaha
date
Fri, 24 Oct 2014 17:05:18 -0700
changeset 886
ef278f51b59f
parent 885
e60c0a6d6330
parent 819
604ed45c7469
child 887
ef001b9debf4

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon Oct 20 23:00:50 2014 -0700
     1.2 +++ b/.hgtags	Fri Oct 24 17:05:18 2014 -0700
     1.3 @@ -340,4 +340,16 @@
     1.4  1a7cc737d8081ffef73d88e94995f80d6a3dc8e0 jdk8u31-b03
     1.5  f24241b85fc90618d243f54202904ee202c44b7e jdk8u31-b04
     1.6  a3b616778301fe101bf3dcfa145d3bb4e8fc8941 jdk8u31-b05
     1.7 +7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u40-b00
     1.8 +c5d9822a3c18cd9e274dfe99e91c33e02bd8f8f4 jdk8u40-b01
     1.9 +504b4455570e14b7fc0a837a09c6401c603516d9 jdk8u40-b02
    1.10 +91cd0ecdbe08eadf09ee89e64bf45360da8f2413 jdk8u40-b03
    1.11 +f3969243c71a0f1c90f312ac755faad1deff3412 jdk8u40-b04
    1.12 +740fea207f7045ab8ccc790867657d5c03a99eec jdk8u40-b05
    1.13 +ced787f7545f26c3b1fdd35119ff41aa79fe6e03 jdk8u40-b06
    1.14 +0d09cb188d39b5abb759977b9020ef957a0374ed jdk8u40-b07
    1.15 +8d4971881c6661c51276ddb84b8e314b37d8d742 jdk8u40-b08
    1.16 +bf87d71911661f583b9300795c9472179b4b3506 jdk8u40-b09
    1.17 +a6d92ff8b962af32e2a9d66e956ff885d4c574b1 jdk8u40-b10
    1.18 +a6dd66098734f58bc0bf847e2ca6f9b335689b9c jdk8u40-b11
    1.19  5761efbc739fdedcbff224e22f920e88b29af4cf jdk8u45-b00
     2.1 --- a/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	Mon Oct 20 23:00:50 2014 -0700
     2.2 +++ b/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	Fri Oct 24 17:05:18 2014 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -35,7 +35,8 @@
    2.11  import java.io.OutputStream;
    2.12  import java.io.ObjectOutputStream;
    2.13  import java.io.ObjectOutput;
    2.14 -import java.util.Hashtable;
    2.15 +import java.util.Map;
    2.16 +import java.util.HashMap;
    2.17  
    2.18  import org.omg.CORBA.INTERNAL;
    2.19  
    2.20 @@ -49,7 +50,7 @@
    2.21       */
    2.22      private class HookPutFields extends ObjectOutputStream.PutField
    2.23      {
    2.24 -        private Hashtable fields = new Hashtable();
    2.25 +        private Map<String,Object> fields = new HashMap<>();
    2.26  
    2.27          /**
    2.28           * Put the value of the named boolean field into the persistent field.
    2.29 @@ -140,7 +141,6 @@
    2.30      public OutputStreamHook()
    2.31          throws java.io.IOException {
    2.32          super();
    2.33 -
    2.34      }
    2.35  
    2.36      public void defaultWriteObject() throws IOException {

mercurial