Mercurial > hg > release > icedtea7-forest-2.6 > corba

changeset 1035:30f5a9254154 icedtea-2.6pre07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u80-b02
author andrew
date Tue, 26 Aug 2014 17:33:01 +0100
parents 250d1a2def5b (current diff) 2444fa7df7e3 (diff)
children 5c25266155ea
files .hgtags
diffstat 3 files changed, 32 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 11 15:09:18 2014 +0100
+++ b/.hgtags	Tue Aug 26 17:33:01 2014 +0100
@@ -420,6 +420,7 @@
 db2e6d87bade9d2061646ff9a6b39b5159fba0ec jdk7u55-b02
 02ff18f156bd3382fe22e4758b138370f5238e97 jdk7u55-b03
 6a88a170331fb38af5046e54bf75f38176af5c41 jdk7u55-b04
+a8d27c3fc4e4e6cd99fa164f04c30a71f474a2d6 jdk7u65-b00
 a8d27c3fc4e4e6cd99fa164f04c30a71f474a2d6 jdk7u55-b05
 af7f1808106bf4e9b4680d943677299829245d08 jdk7u55-b06
 44801796d42bebc90e8c4c7fb5bd79db04b10b75 jdk7u55-b07
@@ -432,7 +433,10 @@
 8efa6e66c13a5329c312d1a521ffab75d9a330e3 jdk7u55-b13
 e041c52fe69128ec3439d26afef9b0fcba00684c jdk7u55-b30
 a0bfd0e80ae0ae6e3a29bf527b5911c83163b3f5 jdk7u55-b14
+ae8120f628c237b18fa5c2610898659b49a60075 jdk7u55-b15
 55ff6957449cf6c79f5d5bb159df27f51ece1659 jdk7u55-b31
+fba15e177b15873e3c63b0efc7c0f5647a243a79 jdk7u55-b32
+6503115cbedda9216083fc1798e2fa5a2775f68a jdk7u55-b33
 c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00
 a531112cc6d0b0a1e7d4ffdaa3ba53addcd25cf4 jdk7u60-b01
 d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02
@@ -457,7 +461,29 @@
 90a4103857ca9ff64a47acfa6b51ca1aa5a782c3 icedtea-2.6pre05
 e5946b2cf82bdea3a4b85917e903168e65a543a7 jdk7u60-b15
 e424fb8452851b56db202488a4e9a283934c4887 jdk7u60-b16
+b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b17
 b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b18
-b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b17
+550ae238459e0f59d9a85d183bc2b4520adac05b jdk7u65-b01
 5d1b39fe68944cff6380db56fbe2fbaa28091bf6 jdk7u60-b19
+6a89d959cbade46fcd281f421ac40a804d098f0b jdk7u65-b02
+afed3d62e8051fe65f431abe87dad50cbeba3800 jdk7u65-b03
+38fabf72970ae509350f57ffad99f6ac8fc6fdad jdk7u65-b04
+12c1621ce88defa65ebc1bdffb7141bd7d0089a6 jdk7u65-b05
+5041c713522c0fc68239fc91f7fb9498dd7edebb jdk7u65-b06
+144887a766dc17a139524dd43f1a0bc8f2a2a3a2 jdk7u65-b07
+5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u65-b08
+1f7156e0a46129dbaf5b248802371564d92630a3 jdk7u65-b09
+be3cbbea3ec1e14b6492acbbd5c08222c24a5061 jdk7u65-b10
+fd7e4972cfefa174ce3d6dcb7f4b409df11a745b jdk7u65-b11
+792ef0370bf7bcf83c9404d2b44f08722dcd73aa jdk7u65-b12
+b95f46ae5207853a89d52b0453a2fb99fffee817 jdk7u65-b13
+6efadedfe3295dbf2af4a350d813524af029b116 jdk7u65-b14
+78966cf34d868ef18b8a3fa7edec368e1cc4739d jdk7u65-b15
+d765ed30bd5ed2bdd71fda56c056333e1b4b0d7d jdk7u65-b16
+cd642d59aca29ff2b56e7ed016be758828f199cd jdk7u65-b17
+8740dc71b1ceb49c76470b46205c28c1302e864d jdk7u65-b30
+b7f66b9f9e8e099428ed7640a184f6135b77e40d jdk7u65-b18
+50ddba8882e7e95150418a30bfc3ee62e3c28c6c jdk7u65-b19
+dae3f20d2306622e39606d0dc967147de174afce jdk7u65-b32
 1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u80-b00
+df1decc820934ad8bf91c853e81c88d4f7590e25 jdk7u80-b01
--- a/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	Mon Aug 11 15:09:18 2014 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	Tue Aug 26 17:33:01 2014 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, 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<String,Object> 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 {
--- a/src/share/classes/org/omg/CORBA/ORB.java	Mon Aug 11 15:09:18 2014 +0100
+++ b/src/share/classes/org/omg/CORBA/ORB.java	Tue Aug 26 17:33:01 2014 +0100
@@ -291,28 +291,12 @@
                     (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) {
                 singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
             } else {
-                singleton = create_impl_with_systemclassloader(className);
+                singleton = create_impl(className);
             }
         }
         return singleton;
     }
 
-   private static ORB create_impl_with_systemclassloader(String className) {
-
-        try {
-            ReflectUtil.checkPackageAccess(className);
-            ClassLoader cl = ClassLoader.getSystemClassLoader();
-            Class<org.omg.CORBA.ORB> orbBaseClass = org.omg.CORBA.ORB.class;
-            Class<?> singletonOrbClass = Class.forName(className, true, cl).asSubclass(orbBaseClass);
-            return (ORB)singletonOrbClass.newInstance();
-        } catch (Throwable ex) {
-            SystemException systemException = new INITIALIZE(
-                "can't instantiate default ORB implementation " + className);
-            systemException.initCause(ex);
-            throw systemException;
-        }
-    }
-
     private static ORB create_impl(String className) {
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         if (cl == null)