svn commit: r1521057 - /tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java

[ma...@apache.org]

Author: markt
Date: Mon Sep  9 11:39:49 2013
New Revision: 1521057

URL: http://svn.apache.org/r1521057
Log:
Fix a couple of Javadoc warnings

Modified:
    tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java?rev=1521057&r1=1521056&r2=1521057&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java Mon Sep  9 11:39:49 2013
@@ -228,22 +228,14 @@ public class WARDirContext extends BaseD
     }
 
     /**
-     * Unbinds the named object. Removes the terminal atomic name in name 
-     * from the target context--that named by all but the terminal atomic 
-     * part of name.
-     * <p>
-     * This method is idempotent. It succeeds even if the terminal atomic 
-     * name is not bound in the target context, but throws 
-     * NameNotFoundException if any of the intermediate contexts do not exist. 
+     * {@inheritDoc}
      * 
-     * @param name the name to bind; may not be empty
-     * @exception NameNotFoundException if an intermediate context does not 
-     * exist
-     * @exception NamingException if a naming exception is encountered
+     * This method is not supported in this implementation
+     * 
+     * @throws OperationNotSupportedException for this implementation
      */
     @Override
-    public void unbind(String name)
-        throws NamingException {
+    public void unbind(String name) throws NamingException {
         throw new OperationNotSupportedException();
     }
 
@@ -298,33 +290,14 @@ public class WARDirContext extends BaseD
 
 
     /**
-     * Destroys the named context and removes it from the namespace. Any 
-     * attributes associated with the name are also removed. Intermediate 
-     * contexts are not destroyed.
-     * <p>
-     * This method is idempotent. It succeeds even if the terminal atomic 
-     * name is not bound in the target context, but throws 
-     * NameNotFoundException if any of the intermediate contexts do not exist. 
-     * 
-     * In a federated naming system, a context from one naming system may be 
-     * bound to a name in another. One can subsequently look up and perform 
-     * operations on the foreign context using a composite name. However, an 
-     * attempt destroy the context using this composite name will fail with 
-     * NotContextException, because the foreign context is not a "subcontext" 
-     * of the context in which it is bound. Instead, use unbind() to remove 
-     * the binding of the foreign context. Destroying the foreign context 
-     * requires that the destroySubcontext() be performed on a context from 
-     * the foreign context's "native" naming system.
-     * 
-     * @param name the name of the context to be destroyed; may not be empty
-     * @exception NameNotFoundException if an intermediate context does not 
-     * exist
-     * @exception javax.naming.NotContextException if the name is bound but does
-     * not name a context, or does not name a context of the appropriate type
+     * {@inheritDoc}
+     * 
+     * This method is not supported in this implementation
+     * 
+     * @throws OperationNotSupportedException for this implementation
      */
     @Override
-    public void destroySubcontext(String name)
-        throws NamingException {
+    public void destroySubcontext(String name) throws NamingException {
         throw new OperationNotSupportedException();
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org