Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5DAD97FA6 for ; Thu, 22 Sep 2011 19:19:39 +0000 (UTC) Received: (qmail 96650 invoked by uid 500); 22 Sep 2011 19:19:38 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 96591 invoked by uid 500); 22 Sep 2011 19:19:38 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 96581 invoked by uid 99); 22 Sep 2011 19:19:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Sep 2011 19:19:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Sep 2011 19:19:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2082E2388900 for ; Thu, 22 Sep 2011 19:19:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1174329 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Date: Thu, 22 Sep 2011 19:19:17 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110922191917.2082E2388900@eris.apache.org> Author: markt Date: Thu Sep 22 19:19:16 2011 New Revision: 1174329 URL: http://svn.apache.org/viewvc?rev=1174329&view=rev Log: Revert r1174322 and apply the correct fix Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=1174329&r1=1174328&r2=1174329&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Thu Sep 22 19:19:16 2011 @@ -43,6 +43,7 @@ import javax.management.ObjectName; import javax.management.ReflectionException; import javax.management.RuntimeErrorException; import javax.management.RuntimeOperationsException; +import javax.management.modelmbean.InvalidTargetObjectTypeException; import javax.management.modelmbean.ModelMBeanNotificationBroadcaster; import org.apache.juli.logging.Log; @@ -498,13 +499,16 @@ public class BaseModelMBean implements D * * @exception InstanceNotFoundException if the managed resource object * cannot be found + * @exception InvalidTargetObjectTypeException if the managed resource + * object is of the wrong type * @exception MBeanException if the initializer of the object throws * an exception * @exception RuntimeOperationsException if the managed resource or the * resource type is null or invalid */ - public Object getManagedResource() throws InstanceNotFoundException, - MBeanException, RuntimeOperationsException { + public Object getManagedResource() + throws InstanceNotFoundException, InvalidTargetObjectTypeException, + MBeanException, RuntimeOperationsException { if (resource == null) throw new RuntimeOperationsException --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org