OpenJDK / bsd-port / jdk8 / jdk
changeset 6316:4472a641b4dc
8003265: Need to clone array of input/output parameters
Reviewed-by: mullan
| author | xuelei |
|---|---|
| date | Fri, 28 Dec 2012 03:50:57 -0800 |
| parents | 645d774b683a |
| children | 46675076f753 0cfcba56cfa7 |
| files | src/share/classes/com/sun/jndi/dns/DnsContext.java src/share/classes/com/sun/jndi/ldap/BasicControl.java |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/jndi/dns/DnsContext.java Fri Dec 28 00:48:12 2012 -0800 +++ b/src/share/classes/com/sun/jndi/dns/DnsContext.java Fri Dec 28 03:50:57 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, 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 @@ -102,8 +102,8 @@ this.domain = new DnsName(domain.endsWith(".") ? domain : domain + "."); - this.servers = servers; - this.environment = (Hashtable<Object,Object>) environment.clone(); + this.servers = servers.clone(); + this.environment = (Hashtable<Object,Object>)environment.clone(); envShared = false; parentIsDns = false; resolver = null; @@ -129,11 +129,11 @@ * no conflict. */ private DnsContext(DnsContext ctx) { - environment = ctx.environment; + environment = (Hashtable<Object,Object>)environment.clone(); envShared = ctx.envShared = true; parentIsDns = ctx.parentIsDns; domain = ctx.domain; - servers = ctx.servers; + servers = ctx.servers.clone(); resolver = ctx.resolver; authoritative = ctx.authoritative; recursion = ctx.recursion;
--- a/src/share/classes/com/sun/jndi/ldap/BasicControl.java Fri Dec 28 00:48:12 2012 -0800 +++ b/src/share/classes/com/sun/jndi/ldap/BasicControl.java Fri Dec 28 03:50:57 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2012, 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 @@ -81,7 +81,7 @@ this.id = id; this.criticality = criticality; if (value != null) { - this.value = value; + this.value = value.clone(); } }