Author: markt Date: Fri Jan 8 12:09:48 2016 New Revision: 1723709 URL: http://svn.apache.org/viewvc?rev=1723709&view=rev Log: Fix an IDE warning and mop up the last few Javadoc issues in this package
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java tomcat/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1723709&r1=1723708&r2=1723709&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Fri Jan 8 12:09:48 2016 @@ -912,10 +912,9 @@ public class NamingContextListener /** * Set the specified local EJBs in the naming context. * - * @param localEjb the EJB descriptor + * @param localEjb the EJB descriptor (unused) */ - public void addLocalEjb( - @SuppressWarnings("unused") ContextLocalEjb localEjb) { + public void addLocalEjb(ContextLocalEjb localEjb) { // NO-OP } Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1723709&r1=1723708&r2=1723709&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Jan 8 12:09:48 2016 @@ -4491,7 +4491,7 @@ public class StandardContext extends Con private int insertPoint = 0; /** - * Return the set of filter mappings. + * @return The set of filter mappings */ public FilterMap[] asArray() { synchronized (lock) { Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1723709&r1=1723708&r2=1723709&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Fri Jan 8 12:09:48 2016 @@ -31,6 +31,8 @@ import java.net.URLClassLoader; import java.security.AccessControlException; import java.util.Random; +import javax.management.InstanceNotFoundException; +import javax.management.MBeanException; import javax.management.ObjectName; import org.apache.catalina.Context; @@ -680,15 +682,15 @@ public final class StandardServer extend * Write the configuration information for this entire <code>Server</code> * out to the server.xml configuration file. * - * @exception javax.management.InstanceNotFoundException - * if the managed resource object cannot be found - * @exception javax.management.MBeanException - * if the initializer of the object throws an exception, or - * persistence is not supported - * @exception javax.management.RuntimeOperationsException - * if an exception is reported by the persistence mechanism + * @exception InstanceNotFoundException + * if the managed resource object cannot be found + * @exception MBeanException + * if the initializer of the object throws an exception, or + * persistence is not supported + * @exception javax.management.RuntimeOperationsException + * if an exception is reported by the persistence mechanism */ - public synchronized void storeConfig() throws Exception { + public synchronized void storeConfig() throws InstanceNotFoundException, MBeanException { try { // Note: Hard-coded domain used since this object is per Server/JVM ObjectName sname = new ObjectName("Catalina:type=StoreConfig"); @@ -709,14 +711,15 @@ public final class StandardServer extend * out to the specified configuration file. * * @param context the context which should save its configuration - * @exception javax.management.InstanceNotFoundException if the managed resource object - * cannot be found - * @exception javax.management.MBeanException if the initializer of the object throws - * an exception, or persistence is not supported - * @exception javax.management.RuntimeOperationsException if an exception is reported - * by the persistence mechanism + * @exception InstanceNotFoundException + * if the managed resource object cannot be found + * @exception MBeanException + * if the initializer of the object throws an exception + * or persistence is not supported + * @exception javax.management.RuntimeOperationsException + * if an exception is reported by the persistence mechanism */ - public synchronized void storeContext(Context context) throws Exception { + public synchronized void storeContext(Context context) throws InstanceNotFoundException, MBeanException { try { // Note: Hard-coded domain used since this object is per Server/JVM ObjectName sname = new ObjectName("Catalina:type=StoreConfig"); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org