Changeset 406 for trunk/openjdk/corba


Ignore:
Timestamp:
Dec 21, 2012, 10:37:13 AM (13 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b27 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java

    r278 r406  
    11/*
    2  * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    216216    // ClientRequestInfo validity table (see ptc/00-08-06 table 21-1).
    217217    // Note: These must be in the same order as specified in contants.
    218     protected static final boolean validCall[][] = {
     218    private static final boolean validCall[][] = {
    219219        // LEGEND:
    220220        // s_req = send_request     r_rep = receive_reply

  • trunk/openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java

    r278 r406  
    11/*
    2  * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    196196    // ServerRequestInfo validity table (see ptc/00-08-06 table 21-2).
    197197    // Note: These must be in the same order as specified in contants.
    198     protected static final boolean validCall[][] = {
     198    private static final boolean validCall[][] = {
    199199        // LEGEND:
    200200        // r_rsc = receive_request_service_contexts

  • trunk/openjdk/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java

    r278 r406  
    11/*
    2  * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    131131                                                  CORBALogDomains.RPC_ENCODING);
    132132
    133     public static Util instance = null;
     133    private static Util instance = null;
    134134
    135135    public Util() {
    136         instance = this;
     136        setInstance(this);
     137    }
     138
     139    private static void setInstance( Util util ) {
     140        assert instance == null : "Instance already defined";
     141        instance = util;
     142    }
     143
     144    public static Util getInstance() {
     145        return instance;
     146    }
     147 
     148    public static boolean isInstanceDefined() {
     149        return instance != null;
    137150    }
    138151

  • trunk/openjdk/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java

    r278 r406  
    11/*
    2  * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    9494        activeObjectMap.putServant( servant, entry ) ;
    9595
    96         if (Util.instance != null) {
     96        if (Util.isInstanceDefined()) {
    9797            POAManagerImpl pm = (POAManagerImpl)poa.the_POAManager() ;
    9898            POAFactory factory = pm.getFactory() ;
    … …  
    134134        activeObjectMap.remove(key);
    135135
    136         if (Util.instance != null) {
     136        if (Util.isInstanceDefined()) {
    137137            POAManagerImpl pm = (POAManagerImpl)poa.the_POAManager() ;
    138138            POAFactory factory = pm.getFactory() ;

  • trunk/openjdk/corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java

    r278 r406  
    11/*
    2  * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    7979    public void shutdown( boolean waitForCompletion )
    8080    {
    81         if (Util.instance != null) {
    82             Util.instance.unregisterTargetsForORB(orb);
     81        if (Util.isInstanceDefined()) {
     82            Util.getInstance().unregisterTargetsForORB(orb);
    8383        }
    8484    }

  • trunk/openjdk/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java

    r278 r406  
    11/*
    2  * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    107107    public ParserData[] getParserData()
    108108    {
    109         return parserData ;
     109        ParserData[] parserArray = new ParserData[parserData.length];
     110        System.arraycopy(parserData, 0, parserArray, 0, parserData.length);
     111        return parserArray;
    110112    }
    111113

  • trunk/openjdk/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java

    r278 r406  
    11/*
    2  * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    6363
    6464    public static final RepositoryIdCache_1_3 cache = new RepositoryIdCache_1_3();
    65     public static final byte[] IDL_IDENTIFIER_CHARS = {
     65    private static final byte[] IDL_IDENTIFIER_CHARS = {
    6666
    6767        // 0 1 2 3  4 5 6 7  8 9 a b  c d e f
    … …  
    181181    public static final String kRemoteValueRepID = "";
    182182
    183     public static final Hashtable kSpecialArrayTypeStrings = new Hashtable();
     183    private static final Hashtable kSpecialArrayTypeStrings = new Hashtable();
    184184
    185185    static {
    … …  
    190190    }
    191191
    192     public static final Hashtable kSpecialCasesRepIDs = new Hashtable();
     192    private static final Hashtable kSpecialCasesRepIDs = new Hashtable();
    193193
    194194    static {
    … …  
    198198    }
    199199
    200     public static final Hashtable kSpecialCasesStubValues = new Hashtable();
     200    private static final Hashtable kSpecialCasesStubValues = new Hashtable();
    201201
    202202    static {
    … …  
    210210
    211211
    212     public static final Hashtable kSpecialCasesVersions = new Hashtable();
     212    private static final Hashtable kSpecialCasesVersions = new Hashtable();
    213213
    214214    static {
    … …  
    221221    }
    222222
    223     public static final Hashtable kSpecialCasesClasses = new Hashtable();
     223    private static final Hashtable kSpecialCasesClasses = new Hashtable();
    224224
    225225    static {
    … …  
    233233    }
    234234
    235     public static final Hashtable kSpecialCasesArrayPrefix = new Hashtable();
     235    private static final Hashtable kSpecialCasesArrayPrefix = new Hashtable();
    236236
    237237    static {
    … …  
    244244    }
    245245
    246     public static final Hashtable kSpecialPrimitives = new Hashtable();
     246    private static final Hashtable kSpecialPrimitives = new Hashtable();
    247247
    248248    static {

  • trunk/openjdk/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java

    r278 r406  
    11/*
    2  * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    6464    // legal use of '.' in a Java name.
    6565
    66     public static final byte[] IDL_IDENTIFIER_CHARS = {
     66    private static final byte[] IDL_IDENTIFIER_CHARS = {
    6767
    6868        // 0 1 2 3  4 5 6 7  8 9 a b  c d e f
    … …  
    199199    public static final String kRemoteValueRepID = "";
    200200
    201     public static final Hashtable kSpecialArrayTypeStrings = new Hashtable();
     201    private static final Hashtable kSpecialArrayTypeStrings = new Hashtable();
    202202
    203203    static {
    … …  
    208208    }
    209209
    210     public static final Hashtable kSpecialCasesRepIDs = new Hashtable();
     210    private static final Hashtable kSpecialCasesRepIDs = new Hashtable();
    211211
    212212    static {
    … …  
    216216    }
    217217
    218     public static final Hashtable kSpecialCasesStubValues = new Hashtable();
     218    private static final Hashtable kSpecialCasesStubValues = new Hashtable();
    219219
    220220    static {
    … …  
    228228
    229229
    230     public static final Hashtable kSpecialCasesVersions = new Hashtable();
     230    private static final Hashtable kSpecialCasesVersions = new Hashtable();
    231231
    232232    static {
    … …  
    239239    }
    240240
    241     public static final Hashtable kSpecialCasesClasses = new Hashtable();
     241    private static final Hashtable kSpecialCasesClasses = new Hashtable();
    242242
    243243    static {
    … …  
    251251    }
    252252
    253     public static final Hashtable kSpecialCasesArrayPrefix = new Hashtable();
     253    private static final Hashtable kSpecialCasesArrayPrefix = new Hashtable();
    254254
    255255    static {
    … …  
    262262    }
    263263
    264     public static final Hashtable kSpecialPrimitives = new Hashtable();
     264    private static final Hashtable kSpecialPrimitives = new Hashtable();
    265265
    266266    static {

  • trunk/openjdk/corba/src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java

    r278 r406  
    11/*
    2  * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    5353    // If isNextIsLocalValid.get() == Boolean.TRUE,
    5454    // the next call to isLocal should be valid
    55     protected static ThreadLocal isNextCallValid = new ThreadLocal() {
     55    private static final ThreadLocal isNextCallValid = new ThreadLocal() {
    5656            protected synchronized Object initialValue() {
    5757                return Boolean.TRUE;

  • trunk/openjdk/corba/src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java

    r278 r406  
    11/*
    2  * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    5858    // legal use of '.' in a Java name.
    5959
    60     public static final byte[] IDL_IDENTIFIER_CHARS = {
     60    private static final byte[] IDL_IDENTIFIER_CHARS = {
    6161
    6262        // 0 1 2 3  4 5 6 7  8 9 a b  c d e f
    … …  
    9696    private static IdentityHashtable classSeqToRepStr = new IdentityHashtable();
    9797
    98     private static IdentityHashtable repStrToByteArray = new IdentityHashtable();
     98    private static final IdentityHashtable repStrToByteArray = new IdentityHashtable();
    9999    private static Hashtable repStrToClass = new Hashtable();
    100100
    … …  
    193193    public static final String kRemoteValueRepID = "";
    194194
    195     public static final Hashtable kSpecialArrayTypeStrings = new Hashtable();
     195    private static final Hashtable kSpecialArrayTypeStrings = new Hashtable();
    196196
    197197    static {
    … …  
    202202    }
    203203
    204     public static final Hashtable kSpecialCasesRepIDs = new Hashtable();
     204    private static final Hashtable kSpecialCasesRepIDs = new Hashtable();
    205205
    206206    static {
    … …  
    210210    }
    211211
    212     public static final Hashtable kSpecialCasesStubValues = new Hashtable();
     212    private static final Hashtable kSpecialCasesStubValues = new Hashtable();
    213213
    214214    static {
    … …  
    222222
    223223
    224     public static final Hashtable kSpecialCasesVersions = new Hashtable();
     224    private static final Hashtable kSpecialCasesVersions = new Hashtable();
    225225
    226226    static {
    … …  
    233233    }
    234234
    235     public static final Hashtable kSpecialCasesClasses = new Hashtable();
     235    private static final Hashtable kSpecialCasesClasses = new Hashtable();
    236236
    237237    static {
    … …  
    245245    }
    246246
    247     public static final Hashtable kSpecialCasesArrayPrefix = new Hashtable();
     247    private static final Hashtable kSpecialCasesArrayPrefix = new Hashtable();
    248248
    249249    static {
    … …  
    256256    }
    257257
    258     public static final Hashtable kSpecialPrimitives = new Hashtable();
     258    private static final Hashtable kSpecialPrimitives = new Hashtable();
    259259
    260260    static {

  • trunk/openjdk/corba/src/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java

    r278 r406  
    11/*
    2  * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    5959
    6060    // Top level log domain for CORBA
    61     public static String TOP_LEVEL_DOMAIN  = "javax.enterprise.resource.corba";
     61    public static final String TOP_LEVEL_DOMAIN  = "javax.enterprise.resource.corba";
    6262
    6363    public static final String RPC              = "rpc" ;

  • trunk/openjdk/corba/src/share/classes/sun/rmi/rmic/iiop/IDLNames.java

    r278 r406  
    11/*
    2  * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    7272    };
    7373
     74    // Legal IDL Identifier characters (1 = legal). Note
     75    // that '.' (2E) is marked as legal even though it is
     76    // not legal in IDL. This allows us to treat a fully
     77    // qualified Java name with '.' package separators
     78    // uniformly, and is safe because that is the only
     79    // legal use of '.' in a Java name.
     80
     81    private static final byte[] IDL_IDENTIFIER_CHARS = {
     82
     83        // 0 1 2 3  4 5 6 7  8 9 a b  c d e f
     84        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 00-0f
     85        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 10-1f
     86        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,1,0, // 20-2f
     87        1,1,1,1, 1,1,1,1, 1,1,0,0, 0,0,0,0, // 30-3f
     88        0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // 40-4f
     89        1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,1, // 50-5f
     90        0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // 60-6f
     91        1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,0, // 70-7f
     92        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 80-8f
     93        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 90-9f
     94        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // a0-af
     95        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // b0-bf
     96        1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // c0-cf
     97        0,1,1,1, 1,1,1,0, 1,1,1,1, 1,0,0,1, // d0-df
     98        1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // e0-ef
     99        0,1,1,1, 1,1,1,0, 1,1,1,1, 1,0,0,1, // f0-ff
     100    };
     101
    74102    //_____________________________________________________________________
    75103    // Public Interfaces
    … …  
    140168
    141169        // Now see if we have any remaining illegal characters (see
    142         // RepositoryId.IDL_IDENTIFIER_CHARS array)...
     170        // IDL_IDENTIFIER_CHARS array)...
    143171
    144172        int length = result.length();
    … …  
    149177            char c = result.charAt(i);
    150178
    151             if (c > 255 || RepositoryId.IDL_IDENTIFIER_CHARS[c] == 0) {
     179            if (c > 255 || IDL_IDENTIFIER_CHARS[c] == 0) {
    152180
    153181                // We gotta convert. Have we already started?

  • trunk/openjdk/corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java

    r278 r406  
    11/*
    2  * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    426426
    427427        p.plnI("public String[] _ids() { ");
    428         p.pln("return _type_ids;");
     428        p.pln("return (String[]) _type_ids.clone();");
    429429        p.pOln("}");
    430430
    … …  
    18611861        if(POATie){
    18621862        p.plnI("public String[] _all_interfaces(org.omg.PortableServer.POA poa, byte[] objectId){");
    1863         p.pln("return _type_ids;");
     1863        p.pln("return (String[]) _type_ids.clone();");
    18641864        p.pOln("}");
    18651865        } else {
    18661866        p.plnI("public String[] _ids() { ");
    1867         p.pln("return _type_ids;");
     1867        p.pln("return (String[]) _type_ids.clone();");
    18681868        p.pOln("}");
    18691869        }
Note: See TracChangeset for help on using the changeset viewer.