Mercurial > hg > release > icedtea7-forest-2.2 > corba
changeset 401:99409154331c
Merge
author | asaha |
---|---|
date | Wed, 30 Nov 2011 13:51:59 -0800 |
parents | bded7b26cda6 (diff) 62b846b0c325 (current diff) |
children | 1b648adeeefa |
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 Nov 17 22:13:54 2011 -0800 +++ b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java Wed Nov 30 13:51:59 2011 -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(); } }
--- a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java Thu Nov 17 22:13:54 2011 -0800 +++ b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java Wed Nov 30 13:51:59 2011 -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(); } }
--- a/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java Thu Nov 17 22:13:54 2011 -0800 +++ b/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java Wed Nov 30 13:51:59 2011 -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(); }