提交 c447b091 编写于 作者: J jgish

8005594: Fix to 8003265 breaks build

Summary: backout changeset 4472a641b4dc
Reviewed-by: smarks, wetmore
上级 80a01c7f
/* /*
* 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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -102,8 +102,8 @@ public class DnsContext extends ComponentDirContext { ...@@ -102,8 +102,8 @@ public class DnsContext extends ComponentDirContext {
this.domain = new DnsName(domain.endsWith(".") this.domain = new DnsName(domain.endsWith(".")
? domain ? domain
: domain + "."); : domain + ".");
this.servers = servers.clone(); this.servers = servers;
this.environment = (Hashtable<Object,Object>)environment.clone(); this.environment = (Hashtable<Object,Object>) environment.clone();
envShared = false; envShared = false;
parentIsDns = false; parentIsDns = false;
resolver = null; resolver = null;
...@@ -129,11 +129,11 @@ public class DnsContext extends ComponentDirContext { ...@@ -129,11 +129,11 @@ public class DnsContext extends ComponentDirContext {
* no conflict. * no conflict.
*/ */
private DnsContext(DnsContext ctx) { private DnsContext(DnsContext ctx) {
environment = (Hashtable<Object,Object>)environment.clone(); environment = ctx.environment;
envShared = ctx.envShared = true; envShared = ctx.envShared = true;
parentIsDns = ctx.parentIsDns; parentIsDns = ctx.parentIsDns;
domain = ctx.domain; domain = ctx.domain;
servers = ctx.servers.clone(); servers = ctx.servers;
resolver = ctx.resolver; resolver = ctx.resolver;
authoritative = ctx.authoritative; authoritative = ctx.authoritative;
recursion = ctx.recursion; recursion = ctx.recursion;
......
/* /*
* 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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -81,7 +81,7 @@ public class BasicControl implements Control { ...@@ -81,7 +81,7 @@ public class BasicControl implements Control {
this.id = id; this.id = id;
this.criticality = criticality; this.criticality = criticality;
if (value != null) { if (value != null) {
this.value = value.clone(); this.value = value;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册