jdk8-mips64-public/corba: changeset 1740:f880cc950ce8

     1.1 --- a/.hgtags	Mon Jan 22 11:10:34 2018 -0800
     1.2 +++ b/.hgtags	Mon Apr 09 11:35:50 2018 -0700
     1.3 @@ -805,6 +805,11 @@
     1.4  2b4802994bf5a4a634258c9ff06d3da474130f8b jdk8u152-b14
     1.5  f89071fbde60b327d6940a34fcdeed96b6440dd2 jdk8u152-b15
     1.6  674aecf3d87ae774e2026a1cb2a60eaa651bc7c2 jdk8u152-b16
     1.7 +e05b7f7238ddad4c2fe428da73c1d234cb90284f jdk8u152-b31
     1.8 +c4e0935e4570dd821b19ede0e06d27378b93caf4 jdk8u152-b32
     1.9 +a6c0eb254c54d050bd04dcd308a2993e517bb0de jdk8u152-b33
    1.10 +abcbb543abb7924fba059ab8eea256589007b79b jdk8u152-b34
    1.11 +3db2418690f0d45d9934121a748948dc659250d5 jdk8u152-b35
    1.12  2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00
    1.13  4449c73dbfdf2e32889e3ce769bd4160daa48b71 jdk8u151-b01
    1.14  ffa099d5b88ff14cea677d2afa4229354e9404d0 jdk8u151-b02
    1.15 @@ -859,8 +864,29 @@
    1.16  2c68567bdcf2bb465d38c9783c0886df98fc496e jdk8u162-b10
    1.17  6029daad75bf459b330fc79ebf208dc35dc682d5 jdk8u162-b11
    1.18  ace99846c1fd92e8bec4cbe912ec3fc8a74fbf0c jdk8u162-b12
    1.19 +acbd335f56f1a09fd8f80c2663367f90cdb00c46 jdk8u162-b31
    1.20 +bb767c7211eace9df83649ba937d2ce507223e4d jdk8u171-b00
    1.21 +9895f9c0845cf5f8dd7be62bf2a1a73a3868f799 jdk8u171-b01
    1.22 +28be709707f8b275aeaa2ed41338678620e3ef5f jdk8u171-b02
    1.23 +d534205fffcf950a11ed37103f5a0c23fe14ee49 jdk8u171-b03
    1.24 +0baf88a7b3880bbefdbb221e67a6ce96b0552033 jdk8u171-b04
    1.25 +0c6a772d60b94de90907f2f6d4683ceac8aba54b jdk8u171-b05
    1.26 +3bca003f024c7bb6774499ff2ede57d300c18c79 jdk8u171-b06
    1.27 +b90a8fc589afa4ac20a4d1e4f819058a5730af9f jdk8u171-b07
    1.28 +f7f59d87e97dd1e3a7ff4ebc5ed843b2ed5f2361 jdk8u171-b08
    1.29 +b3563151fe42c6b997279fc24f8329c4c03add96 jdk8u171-b09
    1.30 +6a9efc03746028c30c3133d57030a388e752dd99 jdk8u171-b10
    1.31 +fd5e2fc0b714d3f18c4c02e67ac093ee0cc2341a jdk8u171-b11
    1.32  72dbc8d63308f5b04b9fd3e06d139d673f992212 jdk8u172-b00
    1.33  fbb7c1e76e59aabb85a70c81301f47b980f83225 jdk8u172-b01
    1.34  56874ff37e89559692d1314d48cbab574544b677 jdk8u172-b02
    1.35  65a52284d8a3a5b1e6de1e8c86eec6683cef346e jdk8u172-b03
    1.36 +c3942af7d2fa3c13cf43c49399d36843dd21731f jdk8u172-b04
    1.37 +13c1af9669c26044981325eb1e2d239e74346b35 jdk8u172-b05
    1.38 +ad4a16f06c355b7e9f13fa2dfab7d22ac9726b3d jdk8u172-b06
    1.39 +bd2328706d14d6d17fac585645c886f94591bb28 jdk8u172-b07
    1.40 +bf262dc4ed05a905b3292bb5f2e765a9c930681c jdk8u172-b08
    1.41 +e9aaa28b626de73ffcef047992a1658f11262984 jdk8u172-b09
    1.42 +f39115b612ab6641f4d1f0bea5b70eed8bd34b19 jdk8u172-b10
    1.43 +6841ddd69c3033b2f6c2cbd3a3410b11e8935ec6 jdk8u172-b11
    1.44  a5563d019ac440b19e791afcd298f3322b311291 jdk8u182-b00

     2.1 --- a/make/BuildCorba.gmk	Mon Jan 22 11:10:34 2018 -0800
     2.2 +++ b/make/BuildCorba.gmk	Mon Apr 09 11:35:50 2018 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 2007, 2018, 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 @@ -174,7 +174,8 @@
    2.11          SETUP := GENERATE_NEWBYTECODE, \
    2.12          SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \
    2.13          EXCLUDES := com/sun/corba/se/PortableActivationIDL \
    2.14 -            com/sun/tools/corba/se/logutil, \
    2.15 +            com/sun/tools/corba/se/logutil \
    2.16 +            sun/misc, \
    2.17          EXCLUDE_FILES := com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
    2.18              com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
    2.19              com/sun/org/omg/CORBA/IDLTypeOperations.java \

     3.1 --- a/src/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java	Mon Jan 22 11:10:34 2018 -0800
     3.2 +++ b/src/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java	Mon Apr 09 11:35:50 2018 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -31,10 +31,9 @@
    3.11  
    3.12  package com.sun.corba.se.impl.ior;
    3.13  
    3.14 -import java.io.ObjectInputStream ;
    3.15 -import java.io.ObjectOutputStream ;
    3.16 -import java.io.IOException ;
    3.17 -import java.io.StringWriter ;
    3.18 +import java.io.IOException;
    3.19 +import java.io.ObjectOutputStream;
    3.20 +import sun.corba.SharedSecrets;
    3.21  
    3.22  import org.omg.CORBA.ORB ;
    3.23  
    3.24 @@ -125,14 +124,20 @@
    3.25      {
    3.26          // read the IOR from the ObjectInputStream
    3.27          int typeLength = stream.readInt();
    3.28 +        SharedSecrets.getJavaOISAccess().checkArray(stream, byte[].class, typeLength);
    3.29          typeData = new byte[typeLength];
    3.30          stream.readFully(typeData);
    3.31 +
    3.32          int numProfiles = stream.readInt();
    3.33 +        SharedSecrets.getJavaOISAccess().checkArray(stream, int[].class, numProfiles);
    3.34 +        SharedSecrets.getJavaOISAccess().checkArray(stream, byte[].class, numProfiles);
    3.35          profileTags = new int[numProfiles];
    3.36          profileData = new byte[numProfiles][];
    3.37          for (int i = 0; i < numProfiles; i++) {
    3.38              profileTags[i] = stream.readInt();
    3.39 -            profileData[i] = new byte[stream.readInt()];
    3.40 +            int dataSize = stream.readInt();
    3.41 +            SharedSecrets.getJavaOISAccess().checkArray(stream, byte[].class, dataSize);
    3.42 +            profileData[i] = new byte[dataSize];
    3.43              stream.readFully(profileData[i]);
    3.44          }
    3.45      }

     4.1 --- a/src/share/classes/sun/corba/SharedSecrets.java	Mon Jan 22 11:10:34 2018 -0800
     4.2 +++ b/src/share/classes/sun/corba/SharedSecrets.java	Mon Apr 09 11:35:50 2018 -0700
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -26,9 +26,10 @@
    4.11  package sun.corba;
    4.12  
    4.13  import com.sun.corba.se.impl.io.ValueUtility;
    4.14 +import sun.misc.JavaOISAccess;
    4.15  import sun.misc.Unsafe;
    4.16  
    4.17 -import java.security.AccessController;
    4.18 +import java.lang.reflect.Method;
    4.19  
    4.20  /** A repository of "shared secrets", which are a mechanism for
    4.21      calling implementation-private methods in another package without
    4.22 @@ -43,6 +44,31 @@
    4.23  public class SharedSecrets {
    4.24      private static final Unsafe unsafe = Unsafe.getUnsafe();
    4.25      private static JavaCorbaAccess javaCorbaAccess;
    4.26 +    private static final Method getJavaOISAccessMethod;
    4.27 +    private static JavaOISAccess javaOISAccess;
    4.28 +
    4.29 +    // Initialize getJavaOISAccessMethod using reflection.
    4.30 +    static {
    4.31 +        try {
    4.32 +            Class sharedSecret = Class.forName("sun.misc.SharedSecrets");
    4.33 +            getJavaOISAccessMethod =
    4.34 +                    sharedSecret.getMethod("getJavaOISAccess");
    4.35 +        } catch (Exception e) {
    4.36 +            throw new ExceptionInInitializerError(e);
    4.37 +        }
    4.38 +    }
    4.39 +
    4.40 +    public static JavaOISAccess getJavaOISAccess() {
    4.41 +        if (javaOISAccess == null) {
    4.42 +            try {
    4.43 +                javaOISAccess =
    4.44 +                        (JavaOISAccess) getJavaOISAccessMethod.invoke(null);
    4.45 +            } catch (Exception e) {
    4.46 +                throw new ExceptionInInitializerError(e);
    4.47 +            }
    4.48 +        }
    4.49 +        return javaOISAccess;
    4.50 +    }
    4.51  
    4.52      public static JavaCorbaAccess getJavaCorbaAccess() {
    4.53          if (javaCorbaAccess == null) {
    4.54 @@ -56,5 +82,4 @@
    4.55      public static void setJavaCorbaAccess(JavaCorbaAccess access) {
    4.56          javaCorbaAccess = access;
    4.57      }
    4.58 -
    4.59  }

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/src/share/classes/sun/misc/JavaOISAccess.java	Mon Apr 09 11:35:50 2018 -0700
     5.3 @@ -0,0 +1,40 @@
     5.4 +/*
     5.5 + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
     5.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.7 + *
     5.8 + * This code is free software; you can redistribute it and/or modify it
     5.9 + * under the terms of the GNU General Public License version 2 only, as
    5.10 + * published by the Free Software Foundation.  Oracle designates this
    5.11 + * particular file as subject to the "Classpath" exception as provided
    5.12 + * by Oracle in the LICENSE file that accompanied this code.
    5.13 + *
    5.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    5.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    5.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    5.17 + * version 2 for more details (a copy is included in the LICENSE file that
    5.18 + * accompanied this code).
    5.19 + *
    5.20 + * You should have received a copy of the GNU General Public License version
    5.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    5.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    5.23 + *
    5.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    5.25 + * or visit www.oracle.com if you need additional information or have any
    5.26 + * questions.
    5.27 + */
    5.28 +
    5.29 +package sun.misc;
    5.30 +
    5.31 +import java.io.InvalidClassException;
    5.32 +import java.io.ObjectInputStream;
    5.33 +
    5.34 +/*
    5.35 + * Skeleton interface added so com.sun.corba.se.impl.ior.StubIORImpl will compile.
    5.36 + * JDK implementation will be used at runtime.
    5.37 + */
    5.38 +public interface JavaOISAccess {
    5.39 +    void setObjectInputFilter(ObjectInputStream stream, ObjectInputFilter filter);
    5.40 +    ObjectInputFilter getObjectInputFilter(ObjectInputStream stream);
    5.41 +    void checkArray(ObjectInputStream stream, Class<?> arrayType, int arrayLength)
    5.42 +        throws InvalidClassException;
    5.43 +}

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/src/share/classes/sun/misc/ObjectInputFilter.java	Mon Apr 09 11:35:50 2018 -0700
     6.3 @@ -0,0 +1,36 @@
     6.4 +/*
     6.5 + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
     6.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.7 + *
     6.8 + * This code is free software; you can redistribute it and/or modify it
     6.9 + * under the terms of the GNU General Public License version 2 only, as
    6.10 + * published by the Free Software Foundation.  Oracle designates this
    6.11 + * particular file as subject to the "Classpath" exception as provided
    6.12 + * by Oracle in the LICENSE file that accompanied this code.
    6.13 + *
    6.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    6.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    6.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    6.17 + * version 2 for more details (a copy is included in the LICENSE file that
    6.18 + * accompanied this code).
    6.19 + *
    6.20 + * You should have received a copy of the GNU General Public License version
    6.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    6.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    6.23 + *
    6.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    6.25 + * or visit www.oracle.com if you need additional information or have any
    6.26 + * questions.
    6.27 + */
    6.28 +
    6.29 +package sun.misc;
    6.30 +
    6.31 +import java.io.InvalidClassException;
    6.32 +import java.io.ObjectInputStream;
    6.33 +
    6.34 +/*
    6.35 + * Skeleton interface added so com.sun.corba.se.impl.ior.StubIORImpl will compile.
    6.36 + * JDK implementation will be used at runtime.
    6.37 + */
    6.38 +public interface ObjectInputFilter {
    6.39 +}

Mercurial > jdk8-mips64-public > corba / changeset

changeset

Merge