Index: src/main/java/javax/naming/Context.java =================================================================== --- src/main/java/javax/naming/Context.java (revision 541639) +++ src/main/java/javax/naming/Context.java (working copy) @@ -505,7 +505,7 @@ * is a name which is relative to the specified parent context names. * * @param n a Name, may not be null - * @param pfx a Name serves as perfix, may not be null + * @param pfx a Name serves as prefix, may not be null * @return the combined name * @throws NamingException if an error occurs. */ Index: src/main/java/javax/naming/InitialContext.java =================================================================== --- src/main/java/javax/naming/InitialContext.java (revision 541639) +++ src/main/java/javax/naming/InitialContext.java (working copy) @@ -427,18 +427,20 @@ } /** - * Composes the name of this context with a name relative to this context. - * Because an initial context could not be named relative to any context - * except itself, the value of the prefix parameter must be an empty name. + * Combines two names into a composite name according to the syntax for this + * context. The name prefix is expected to be the name of one + * or more of the immediate parent contexts of this context, so should be an + * empty name for an InitialContext. name is + * a name relative to this context. Neither prefix nor + * name may be null. * * @param name - * a name relative to this context. + * a Name, may not be null * @param prefix - * the name of this context relative to one of its ancestors. - * - * @return the composition of prefix and name. + * a Name serves as prefix, may not be null + * @return the combined name * @throws NamingException - * if a naming exception happens. + * if an error occurs. */ public Name composeName(Name name, Name prefix) throws NamingException { if (null == name) { @@ -448,18 +450,16 @@ } /** - * Composes the name of this context with a name relative to this context. - * Because an initial context could not be named relative to any context - * except itself, the value of the prefix parameter must be an empty name. + * Combines two names into a composite name according to the syntax for + * this context. The name prefix is expected to be the name of + * one or more of the immediate parent contexts of this context, so should + * be an empty string for an InitialContext. + * name is a name relative to this context. * - * @param name - * a name relative to this context. - * @param prefix - * the name of this context relative to one of its ancestors. - * - * @return the composition of prefix and name. - * @throws NamingException - * if a naming exception happens. + * @param name a Name, may not be null + * @param prefix a Name serves as prefix, may not be null + * @return the combined name + * @throws NamingException if an error occurs. */ public String composeName(String name, String prefix) throws NamingException { Index: src/main/java/javax/naming/directory/SearchControls.java =================================================================== --- src/main/java/javax/naming/directory/SearchControls.java (revision 541639) +++ src/main/java/javax/naming/directory/SearchControls.java (working copy) @@ -118,7 +118,7 @@ private boolean derefLink; /** - * Flag showing whether object is returned in the search results. + * Flag showing whether an Object is returned in the search results. * * @serial */ @@ -125,7 +125,7 @@ private boolean returnObj; /** - * Contains the maximum number of search results to return. + * Maximum number of search results that will be returned. * * @serial */ Index: src/main/java/org/apache/harmony/jndi/provider/rmi/registry/RegistryContext.java =================================================================== --- src/main/java/org/apache/harmony/jndi/provider/rmi/registry/RegistryContext.java (revision 541639) +++ src/main/java/org/apache/harmony/jndi/provider/rmi/registry/RegistryContext.java (working copy) @@ -752,7 +752,7 @@ * if csf is not null. * * @param csf - * Client-side socket factory used to make connections to the + * RMIClientSocketFactory that is used to create socket connections to the * registry. If null, default socket factory is used. * See * {@link LocateRegistry#getRegistry(String, int, RMIClientSocketFactory)}.