# HG changeset patch
# User mbankal
# Date 1332928393 25200
# Node ID 2846cb957582944f752bedd39b7efb608af0b100
# Parent  e324dfb90c9eafddd7afe8a53fd58b21f90b2e33# Parent  5222b7d658d44317f2ae684b767c6f2d59fb08c0
Merge

diff -r e324dfb90c9e -r 2846cb957582 src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java
--- a/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java	Wed Mar 28 02:50:50 2012 -0700
+++ b/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java	Wed Mar 28 02:53:13 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, 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
@@ -425,7 +425,7 @@
         // Write the _ids() method...
 
         p.plnI("public String[] _ids() { ");
-        p.pln("return _type_ids;");
+        p.pln("return (String[]) _type_ids.clone();");
         p.pOln("}");
 
         // Get all the methods and write each stub method...
@@ -1860,11 +1860,11 @@
     {
         if(POATie){
         p.plnI("public String[] _all_interfaces(org.omg.PortableServer.POA poa, byte[] objectId){");
-        p.pln("return _type_ids;");
+        p.pln("return (String[]) _type_ids.clone();");
         p.pOln("}");
         } else {
         p.plnI("public String[] _ids() { ");
-        p.pln("return _type_ids;");
+        p.pln("return (String[]) _type_ids.clone();");
         p.pOln("}");
         }
     }