# HG changeset patch
# User lana
# Date 1330136568 28800
# Node ID 2082eb35d49a9c2aab90b8d4fd31cefb7a23b82e
# Parent  7bf4278af0304864f3c78c4f603ddfb41a503fde# Parent  695408e22b2916619ab7fb494fc70d4b7168927e
Merge

diff -r 7bf4278af030 -r 2082eb35d49a src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java	Thu Feb 23 12:03:03 2012 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java	Fri Feb 24 18:22:48 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, 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
@@ -82,6 +82,6 @@
     private String[] __ids = { "IDL:omg.org/DynamicAny/DynAnyFactory:1.0" };
 
     public String[] _ids() {
-        return __ids;
+        return (String[]) __ids.clone();
     }
 }
diff -r 7bf4278af030 -r 2082eb35d49a src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java	Thu Feb 23 12:03:03 2012 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java	Fri Feb 24 18:22:48 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, 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
@@ -195,6 +195,6 @@
     private String[] __ids = { "IDL:omg.org/DynamicAny/DynAny:1.0" };
 
     public String[] _ids() {
-        return __ids;
+        return (String[]) __ids.clone();
     }
 }
diff -r 7bf4278af030 -r 2082eb35d49a src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java
--- a/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java	Thu Feb 23 12:03:03 2012 -0800
+++ b/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java	Fri Feb 24 18:22:48 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, 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
@@ -138,7 +138,7 @@
 
     public String[] _ids ()
     {
-        return __ids;
+        return (String[]) __ids.clone();
     }