You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2003/05/09 13:32:00 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java mbeans-descriptors.xml
amyroh 2003/05/09 04:32:00
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java mbeans-descriptors.xml
Log:
Make objectName attribute visible for j2eeTYpe=Servlet mbean.
Revision Changes Path
1.50 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- StandardContext.java 29 Apr 2003 20:11:01 -0000 1.49
+++ StandardContext.java 9 May 2003 11:31:59 -0000 1.50
@@ -4935,7 +4935,7 @@
org.apache.catalina.startup.Constants.ApplicationWebXml);
}
if (stream == null) {
- return null;
+ return "";
}
BufferedReader br = new BufferedReader(
new InputStreamReader(stream));
@@ -4947,7 +4947,7 @@
strRead = br.readLine();
}
} catch (IOException e) {
- return null;
+ return "";
}
return sb.toString();
1.15 +4 -0 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mbeans-descriptors.xml 2 May 2003 21:00:26 -0000 1.14
+++ mbeans-descriptors.xml 9 May 2003 11:31:59 -0000 1.15
@@ -632,6 +632,10 @@
type="java.lang.String"
writeable="false"/>
+ <attribute name="objectName"
+ description="Name of the object"
+ type="java.lang.String"/>
+
<operation name="findMappings"
description="Return the mappings associated with this wrapper"
impact="INFO"
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org