diff --git a/src/share/classes/javax/naming/InitialContext.java b/src/share/classes/javax/naming/InitialContext.java
index 0e105d0f8401005b2670bfbe62a32ece1ffcaf78..b9cc6e545dc53ef0c14d8af2c6dced481744bacc 100644
--- a/src/share/classes/javax/naming/InitialContext.java
+++ b/src/share/classes/javax/naming/InitialContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  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
@@ -198,6 +198,8 @@ public class InitialContext implements Context {
      *
      * <p> This constructor will not modify <tt>environment</tt>
      * or save a reference to it, but may save a clone.
+     * Caller should not modify mutable keys and values in
+     * <tt>environment</tt> after it has been passed to the constructor.
      *
      * @param environment
      *          environment used to create the initial context.
diff --git a/src/share/classes/javax/naming/directory/InitialDirContext.java b/src/share/classes/javax/naming/directory/InitialDirContext.java
index d96643acf4b8853bce2ae84939178b989ce69207..1a3aac6407ec81a1be77a268423571448756069a 100644
--- a/src/share/classes/javax/naming/directory/InitialDirContext.java
+++ b/src/share/classes/javax/naming/directory/InitialDirContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  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
@@ -86,6 +86,8 @@ public class InitialDirContext extends InitialContext implements DirContext {
      *
      * <p> This constructor will not modify <tt>environment</tt>
      * or save a reference to it, but may save a clone.
+     * Caller should not modify mutable keys and values in
+     * <tt>environment</tt> after it has been passed to the constructor.
      *
      * @param environment
      *          environment used to create the initial DirContext.
diff --git a/src/share/classes/javax/naming/ldap/InitialLdapContext.java b/src/share/classes/javax/naming/ldap/InitialLdapContext.java
index 896cae8ccaf264c0da388288b7d59eb778fdfe4e..757d29e7f788616e91b09c9aa90b3c77c48e59ac 100644
--- a/src/share/classes/javax/naming/ldap/InitialLdapContext.java
+++ b/src/share/classes/javax/naming/ldap/InitialLdapContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  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
@@ -110,6 +110,8 @@ public class InitialLdapContext extends InitialDirContext implements LdapContext
      *
      * <p> This constructor will not modify its parameters or
      * save references to them, but may save a clone or copy.
+     * Caller should not modify mutable keys and values in
+     * <tt>environment</tt> after it has been passed to the constructor.
      *
      * <p> <tt>connCtls</tt> is used as the underlying context instance's
      * connection request controls.  See the class description