diff options
author | lana <none@none> | 2012-02-24 18:22:48 -0800 |
---|---|---|
committer | lana <none@none> | 2012-02-24 18:22:48 -0800 |
commit | 32f448e6bec5e42a799baf7728cba6f2e0ded0bf (patch) | |
tree | 5e470cd4761ef8f9d4ef0d77c741885781578eec | |
parent | e7ce7d54d27f2bf0dbc514a8f12edec7b117e31b (diff) | |
parent | d38b0b607fb358b6c73093150c6178f41c169e43 (diff) |
Mergejdk8-b28
3 files changed, 6 insertions, 6 deletions
diff --git a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java index 4704ee1..95025ee 100644 --- a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java +++ b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java @@ -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 @@ public class DynAnyFactoryImpl private String[] __ids = { "IDL:omg.org/DynamicAny/DynAnyFactory:1.0" }; public String[] _ids() { - return __ids; + return (String[]) __ids.clone(); } } diff --git a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java index f0ba6ee..96da602 100644 --- a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java +++ b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java @@ -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 @@ abstract class DynAnyImpl extends org.omg.CORBA.LocalObject implements DynAny private String[] __ids = { "IDL:omg.org/DynamicAny/DynAny:1.0" }; public String[] _ids() { - return __ids; + return (String[]) __ids.clone(); } } diff --git a/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java b/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java index ab3efdb..508f827 100644 --- a/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java +++ b/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java @@ -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 abstract class _CodeBaseImplBase extends org.omg.CORBA.portable.ObjectImp public String[] _ids () { - return __ids; + return (String[]) __ids.clone(); } |