changeset 6318:0cfcba56cfa7

8005594: Fix to 8003265 breaks build Summary: backout changeset 4472a641b4dc Reviewed-by: smarks, wetmore
author jgish
date Fri, 28 Dec 2012 18:32:26 -0500
parents 4472a641b4dc
children ac5e29b62288
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 03:50:57 2012 -0800
+++ b/src/share/classes/com/sun/jndi/dns/DnsContext.java	Fri Dec 28 18:32:26 2012 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, 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
@@ -102,8 +102,8 @@
         this.domain = new DnsName(domain.endsWith(".")
                                   ? domain
                                   : domain + ".");
-        this.servers = servers.clone();
-        this.environment = (Hashtable<Object,Object>)environment.clone();
+        this.servers = servers;
+        this.environment = (Hashtable<Object,Object>) environment.clone();
         envShared = false;
         parentIsDns = false;
         resolver = null;
@@ -129,11 +129,11 @@
      * no conflict.
      */
     private DnsContext(DnsContext ctx) {
-        environment = (Hashtable<Object,Object>)environment.clone();
+        environment = ctx.environment;
         envShared = ctx.envShared = true;
         parentIsDns = ctx.parentIsDns;
         domain = ctx.domain;
-        servers = ctx.servers.clone();
+        servers = ctx.servers;
         resolver = ctx.resolver;
         authoritative = ctx.authoritative;
         recursion = ctx.recursion;
--- a/src/share/classes/com/sun/jndi/ldap/BasicControl.java	Fri Dec 28 03:50:57 2012 -0800
+++ b/src/share/classes/com/sun/jndi/ldap/BasicControl.java	Fri Dec 28 18:32:26 2012 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, 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.clone();
+            this.value = value;
         }
     }