Merge

Wed, 28 Mar 2012 02:53:13 -0700

author
mbankal
date
Wed, 28 Mar 2012 02:53:13 -0700
changeset 372
2846cb957582
parent 371
e324dfb90c9e
parent 370
5222b7d658d4
child 373
a00c5c0b1f30

Merge

     1.1 --- a/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java	Wed Mar 28 02:50:50 2012 -0700
     1.2 +++ b/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java	Wed Mar 28 02:53:13 2012 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -425,7 +425,7 @@
    1.11          // Write the _ids() method...
    1.12  
    1.13          p.plnI("public String[] _ids() { ");
    1.14 -        p.pln("return _type_ids;");
    1.15 +        p.pln("return (String[]) _type_ids.clone();");
    1.16          p.pOln("}");
    1.17  
    1.18          // Get all the methods and write each stub method...
    1.19 @@ -1860,11 +1860,11 @@
    1.20      {
    1.21          if(POATie){
    1.22          p.plnI("public String[] _all_interfaces(org.omg.PortableServer.POA poa, byte[] objectId){");
    1.23 -        p.pln("return _type_ids;");
    1.24 +        p.pln("return (String[]) _type_ids.clone();");
    1.25          p.pOln("}");
    1.26          } else {
    1.27          p.plnI("public String[] _ids() { ");
    1.28 -        p.pln("return _type_ids;");
    1.29 +        p.pln("return (String[]) _type_ids.clone();");
    1.30          p.pOln("}");
    1.31          }
    1.32      }

mercurial