remm 2004/01/26 11:47:05
Modified: catalina/src/share/org/apache/catalina/core
ApplicationHttpRequest.java
StandardHostDeployer.java
ApplicationHttpResponse.java StandardContext.java
StandardService.java ApplicationDispatcher.java
Log:
- Remove compilation warnings.
Revision Changes Path
1.16 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ApplicationHttpRequest.java 22 Jan 2004 18:21:36 -0000 1.15
+++ ApplicationHttpRequest.java 26 Jan 2004 19:47:03 -0000 1.16
@@ -577,7 +577,7 @@
*/
public String getInfo() {
- return (this.info);
+ return (info);
}
1.19 +1 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java
Index: StandardHostDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- StandardHostDeployer.java 7 Jan 2004 23:34:31 -0000 1.18
+++ StandardHostDeployer.java 26 Jan 2004 19:47:03 -0000 1.19
@@ -513,7 +513,6 @@
try {
stream = config.openStream();
Digester digester = createDigester();
- digester.setDebug(host.getDebug());
digester.setClassLoader(this.getClass().getClassLoader());
digester.clear();
digester.push(this);
@@ -863,8 +862,6 @@
protected Digester createDigester() {
if (digester == null) {
digester = new CatalinaDigester();
- if (host.getDebug() > 0)
- digester.setDebug(3);
digester.setValidating(false);
contextRuleSet = new ContextRuleSet("");
digester.addRuleSet(contextRuleSet);
1.3 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java
Index: ApplicationHttpResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationHttpResponse.java 2 Sep 2003 21:22:04 -0000 1.2
+++ ApplicationHttpResponse.java 26 Jan 2004 19:47:03 -0000 1.3
@@ -387,7 +387,7 @@
*/
public String getInfo() {
- return (this.info);
+ return (info);
}
1.112 +3 -4
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.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- StandardContext.java 25 Jan 2004 20:57:18 -0000 1.111
+++ StandardContext.java 26 Jan 2004 19:47:03 -0000 1.112
@@ -4129,9 +4129,8 @@
// Validate required extensions
boolean dependencyCheck = true;
try {
- ExtensionValidator validator = ExtensionValidator.getInstance();
- dependencyCheck = validator.validateApplication(getResources(),
- this);
+ dependencyCheck = ExtensionValidator.validateApplication
+ (getResources(), this);
} catch (IOException ioe) {
log.error("Error in dependencyCheck", ioe);
dependencyCheck = false;
1.9 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java
Index: StandardService.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StandardService.java 26 Jan 2004 18:14:30 -0000 1.8
+++ StandardService.java 26 Jan 2004 19:47:03 -0000 1.9
@@ -256,7 +256,7 @@
*/
public String getInfo() {
- return (this.info);
+ return (info);
}
1.28 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Index: ApplicationDispatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ApplicationDispatcher.java 22 Jan 2004 18:21:36 -0000 1.27
+++ ApplicationDispatcher.java 26 Jan 2004 19:47:03 -0000 1.28
@@ -323,7 +323,7 @@
*/
public String getInfo() {
- return (this.info);
+ return (info);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
