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 <code>null</code> 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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
