Mercurial > hg > release > icedtea7-forest-2.2 > corba
changeset 400:bded7b26cda6
Merge
author | asaha |
---|---|
date | Wed, 02 Nov 2011 15:18:02 -0700 |
parents | a966d5aad2ff (current diff) 2282bde7a7d2 (diff) |
children | 99409154331c 254ee36d115a |
files | |
diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java Thu Oct 27 12:11:30 2011 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java Wed Nov 02 15:18:02 2011 -0700 @@ -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(); } }
--- a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java Thu Oct 27 12:11:30 2011 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java Wed Nov 02 15:18:02 2011 -0700 @@ -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(); } }
--- a/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java Thu Oct 27 12:11:30 2011 -0700 +++ b/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java Wed Nov 02 15:18:02 2011 -0700 @@ -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(); }