amyroh 02/05/03 17:17:25
Modified: catalina/src/share/org/apache/catalina/mbeans
ContextResourceMBean.java
Log:
Only try the ResourceParams if the attribute names is *not* one of the
standard ones.
Revision Changes Path
1.2 +28 -26
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java
Index: ContextResourceMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContextResourceMBean.java 3 May 2002 23:42:48 -0000 1.1
+++ ContextResourceMBean.java 4 May 2002 00:17:25 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java,v
1.1 2002/05/03 23:42:48 amyroh Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/03 23:42:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java,v
1.2 2002/05/04 00:17:25 amyroh Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/04 00:17:25 $
*
* ====================================================================
*
@@ -86,7 +86,7 @@
* <code>org.apache.catalina.deploy.ContextResource</code> component.</p>
*
* @author Amy Roh
- * @version $Revision: 1.1 $ $Date: 2002/05/03 23:42:48 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/04 00:17:25 $
*/
public class ContextResourceMBean extends BaseModelMBean {
@@ -149,6 +149,7 @@
throw new MBeanException(e);
}
+ String value = null;
if ("auth".equals(name)) {
return (cr.getAuth());
} else if ("description".equals(name)) {
@@ -159,22 +160,22 @@
return (cr.getScope());
} else if ("type".equals(name)) {
return (cr.getType());
- }
-
- NamingResources nr = cr.getNamingResource();
- if (nr == null) {
- throw new AttributeNotFoundException
- ("Cannot find naming resource "+cr.getName());
- }
- ResourceParams rp = nr.findResourceParams(cr.getName());
- if (rp == null) {
- throw new AttributeNotFoundException
- ("Cannot find resource param "+cr.getName());
- }
- String value = (String) rp.getParameters().get(name);
- if (value == null) {
- throw new AttributeNotFoundException
- ("Cannot find attribute "+cr.getName());
+ } else {
+ NamingResources nr = cr.getNamingResource();
+ if (nr == null) {
+ throw new AttributeNotFoundException
+ ("Cannot find naming resource "+cr.getName());
+ }
+ ResourceParams rp = nr.findResourceParams(cr.getName());
+ if (rp == null) {
+ throw new AttributeNotFoundException
+ ("Cannot find resource param "+cr.getName());
+ }
+ value = (String) rp.getParameters().get(name);
+ if (value == null) {
+ throw new AttributeNotFoundException
+ ("Cannot find attribute "+cr.getName());
+ }
}
return value;
@@ -230,13 +231,14 @@
cr.setScope((String)value);
} else if ("type".equals(name)) {
cr.setType((String)value);
+ } else {
+ ResourceParams rp =
cr.getNamingResource().findResourceParams(cr.getName());
+ if (rp == null) {
+ throw new AttributeNotFoundException
+ ("Cannot find resource params "+cr.getName());
+ }
+ rp.getParameters().put(name, value);
}
- ResourceParams rp = cr.getNamingResource().findResourceParams(cr.getName());
- if (rp == null) {
- throw new AttributeNotFoundException
- ("Cannot find resource params "+cr.getName());
- }
- rp.getParameters().put(name, value);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
