Fri, 24 Feb 2012 18:22:48 -0800
Merge
1.1 --- a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java Thu Feb 23 12:03:03 2012 -0800 1.2 +++ b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java Fri Feb 24 18:22:48 2012 -0800 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2000, 2011, 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 @@ -82,6 +82,6 @@ 1.11 private String[] __ids = { "IDL:omg.org/DynamicAny/DynAnyFactory:1.0" }; 1.12 1.13 public String[] _ids() { 1.14 - return __ids; 1.15 + return (String[]) __ids.clone(); 1.16 } 1.17 }
2.1 --- a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java Thu Feb 23 12:03:03 2012 -0800 2.2 +++ b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java Fri Feb 24 18:22:48 2012 -0800 2.3 @@ -1,5 +1,5 @@ 2.4 /* 2.5 - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. 2.6 + * Copyright (c) 2000, 2011, 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 @@ -195,6 +195,6 @@ 2.11 private String[] __ids = { "IDL:omg.org/DynamicAny/DynAny:1.0" }; 2.12 2.13 public String[] _ids() { 2.14 - return __ids; 2.15 + return (String[]) __ids.clone(); 2.16 } 2.17 }
3.1 --- a/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java Thu Feb 23 12:03:03 2012 -0800 3.2 +++ b/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java Fri Feb 24 18:22:48 2012 -0800 3.3 @@ -1,5 +1,5 @@ 3.4 /* 3.5 - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. 3.6 + * Copyright (c) 1999, 2011, 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 @@ -138,7 +138,7 @@ 3.11 3.12 public String[] _ids () 3.13 { 3.14 - return __ids; 3.15 + return (String[]) __ids.clone(); 3.16 } 3.17 3.18