remm 2003/07/19 03:03:29
Modified: util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
Log:
- Improve filter exception trace.
- I'll add a note in the HTML that the full stack trace of the root cause is
available in the logs.
Revision Changes Path
1.5 +12 -8
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
Index: Jdk14Compat.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Jdk14Compat.java 18 Jul 2003 22:24:37 -0000 1.4
+++ Jdk14Compat.java 19 Jul 2003 10:03:29 -0000 1.5
@@ -132,14 +132,18 @@
trace.append(t.toString()).append('\n');
StackTraceElement[] elements = t.getStackTrace();
int pos = elements.length;
- for (int i = (elements.length - 1); i >= 0; i--) {
- if (elements[i].getClassName().startsWith("javax.servlet.")) {
- pos = i + 1;
- break;
+ for (int i = 0; i < elements.length; i++) {
+ if ((elements[i].getClassName().startsWith
+ ("org.apache.catalina.core.ApplicationFilterChain"))
+ && (elements[i].getMethodName().equals("internalDoFilter"))) {
+ pos = i;
}
}
for (int i = 0; i < pos; i++) {
- trace.append('\t').append(elements[i].toString()).append('\n');
+ if (!(elements[i].getClassName().startsWith
+ ("org.apache.catalina.core."))) {
+ trace.append('\t').append(elements[i].toString()).append('\n');
+ }
}
return trace.toString();
}
1.8 +6 -5
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
Index: JdkCompat.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JdkCompat.java 19 Jul 2003 09:05:11 -0000 1.7
+++ JdkCompat.java 19 Jul 2003 10:03:29 -0000 1.8
@@ -141,7 +141,7 @@
javaVersion = JAVA_1_3;
Class.forName("java.lang.CharSequence");
javaVersion = JAVA_1_4;
- java14=true;
+ //java14=true;
} catch (ClassNotFoundException cnfe) {
// swallow as we've hit the max class version that we have
}
@@ -211,7 +211,8 @@
StringWriter stackTrace = new StringWriter();
t.printStackTrace(new PrintWriter(stackTrace));
String st = stackTrace.toString();
- int i = st.lastIndexOf("javax.servlet.");
+ int i = st.lastIndexOf
+ ("org.apache.catalina.core.ApplicationFilterChain.internalDoFilter");
if (i > -1) {
return st.substring(0, i - 4);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
