amyroh 2004/09/17 14:02:34
Modified:jasper2/src/share/org/apache/jasper/compiler SmapUtil.java
jasper2/src/share/org/apache/jasper/runtime HttpJspBase.java
jasper2/src/share/org/apache/jasper/security
SecurityClassLoad.java
jasper2/src/share/org/apache/jasper/xmlparser
ParserUtils.java UTF8Reader.java
Log:
More logging changes.
Revision ChangesPath
1.24 +31 -14
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java
Index: SmapUtil.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SmapUtil.java 17 Mar 2004 19:23:03 - 1.23
+++ SmapUtil.java 17 Sep 2004 21:02:34 - 1.24
@@ -43,6 +43,9 @@
*/
public class SmapUtil {
+private static org.apache.commons.logging.Log log=
+org.apache.commons.logging.LogFactory.getLog( SmapUtil.class );
+
private static final boolean verbose = false;
//*
@@ -284,7 +287,8 @@
int constantPoolCountPos = genPos;
int constantPoolCount = readU2();
if (verbose) {
-System.out.println(constant pool count: + constantPoolCount);
+if (log.isDebugEnabled())
+log.debug(constant pool count: + constantPoolCount);
}
writeU2(constantPoolCount);
@@ -300,13 +304,15 @@
randomAccessWriteU2(constantPoolCountPos, constantPoolCount);
if (verbose) {
-System.out.println(
+if (log.isDebugEnabled())
+log.debug(
SourceDebugExtension not found, installed at:
+ sdeIndex);
}
} else {
if (verbose) {
-System.out.println(
+if (log.isDebugEnabled())
+log.debug(
SourceDebugExtension found at: + sdeIndex);
}
}
@@ -314,7 +320,8 @@
int interfaceCount = readU2();
writeU2(interfaceCount);
if (verbose) {
-System.out.println(interfaceCount: + interfaceCount);
+if (log.isDebugEnabled())
+log.debug(interfaceCount: + interfaceCount);
}
copy(interfaceCount * 2);
copyMembers(); // fields
@@ -323,7 +330,8 @@
int attrCount = readU2();
writeU2(attrCount);
if (verbose) {
-System.out.println(class attrCount: + attrCount);
+if (log.isDebugEnabled())
+log.debug(class attrCount: + attrCount);
}
// copy the class attributes, return true if SDE attr found (not copied)
if (!copyAttrs(attrCount)) {
@@ -331,7 +339,8 @@
++attrCount;
randomAccessWriteU2(attrCountPos, attrCount);
if (verbose) {
-System.out.println(class attrCount incremented);
+if (log.isDebugEnabled())
+log.debug(class attrCount incremented);
}
}
writeAttrForSDE(sdeIndex);
@@ -341,14 +350,16 @@
int count = readU2();
writeU2(count);
if (verbose) {
-System.out.println(members count: + count);
+if (log.isDebugEnabled())
+log.debug(members count: + count);
}
for (int i = 0; i count; ++i) {
copy(6); // access, name, descriptor
int attrCount = readU2();
writeU2(attrCount);
if (verbose) {
-System.out.println(member attr count: + attrCount);
+if (log.isDebugEnabled())
+log.debug(member attr count: + attrCount);
}
copyAttrs(attrCount);
}
@@ -362,7 +373,8 @@
if (nameIndex == sdeIndex) {
sdeFound = true;
if (verbose) {
-System.out.println(SDE attr found);
+if (log.isDebugEnabled())
+log.debug(SDE attr found);
}
} else {
writeU2(nameIndex); // name
@@ -370,7 +382,8 @@
