rsitze 2002/06/05 14:49:20
Modified: java/src/org/apache/axis AxisFault.java
ConfigurationException.java
java/src/org/apache/axis/utils JavaUtils.java
java/src/org/apache/axis/deployment/wsdd
WSDDDeployableItem.java
java/src/org/apache/axis/client Call.java
java/src/org/apache/axis/encoding
DeserializationContextImpl.java
java/src/org/apache/axis/transport/http AxisServlet.java
Log:
Remove unnecessary printStackTrace() calls.
a) Replace with appropriate log statement.
b) added/use JavaUtils.stackToString().
Revision Changes Path
1.45 +2 -7 xml-axis/java/src/org/apache/axis/AxisFault.java
Index: AxisFault.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisFault.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- AxisFault.java 3 Jun 2002 22:30:15 -0000 1.44
+++ AxisFault.java 5 Jun 2002 21:49:20 -0000 1.45
@@ -58,6 +58,7 @@
import org.apache.axis.encoding.SerializationContext;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.SOAPFaultElement;
+import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.Log;
@@ -208,15 +209,9 @@
faultDetails.add(el);
}
- // get the stack trace of the target exception
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- PrintStream ps = new PrintStream( stream );
- target.printStackTrace(ps);
- ps.close();
-
el = XMLUtils.StringToElement(Constants.NS_URI_AXIS,
"stackTrace",
- stream.toString());
+ JavaUtils.stackToString(target));
faultDetails.add(el);
}
1.6 +4 -10 xml-axis/java/src/org/apache/axis/ConfigurationException.java
Index: ConfigurationException.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/ConfigurationException.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConfigurationException.java 18 May 2002 00:20:48 -0000 1.5
+++ ConfigurationException.java 5 Jun 2002 21:49:20 -0000 1.6
@@ -55,6 +55,8 @@
package org.apache.axis;
+import org.apache.axis.utils.JavaUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -93,7 +95,7 @@
*/
public ConfigurationException(Exception e) {
super(e.toString() + (copyStackByDefault? ("\n"
- + stackToString(e)) : "" ));
+ + JavaUtils.stackToString(e)) : "" ));
// Log the exception the first time it appears.
if (!(e instanceof ConfigurationException)) {
@@ -108,19 +110,11 @@
*/
public ConfigurationException(Exception e, final boolean copyStack) {
super(e.toString() + (copyStack ? "\n"
- + stackToString(e) : "" ));
+ + JavaUtils.stackToString(e) : "" ));
// Log the exception the first time it appears.
if (!(e instanceof ConfigurationException)) {
log.debug("Exception: ", e);
}
- }
-
- protected static String stackToString(Exception e){
- java.io.StringWriter sw= new java.io.StringWriter(1024);
- java.io.PrintWriter pw= new java.io.PrintWriter(sw);
- e.printStackTrace(pw);
- pw.close();
- return sw.toString();
}
}
1.45 +10 -0 xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
Index: JavaUtils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- JavaUtils.java 22 May 2002 18:24:47 -0000 1.44
+++ JavaUtils.java 5 Jun 2002 21:49:20 -0000 1.45
@@ -81,6 +81,8 @@
*/
public class JavaUtils
{
+ public static final String LS = System.getProperty("line.separator");
+
protected static Log log =
LogFactory.getLog(JavaUtils.class.getName());
@@ -871,4 +873,12 @@
return false;
}
+
+ public static String stackToString(Throwable e){
+ java.io.StringWriter sw= new java.io.StringWriter(1024);
+ java.io.PrintWriter pw= new java.io.PrintWriter(sw);
+ e.printStackTrace(pw);
+ pw.close();
+ return sw.toString();
+ }
}
1.32 +3 -10
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java
Index: WSDDDeployableItem.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- WSDDDeployableItem.java 31 May 2002 19:08:06 -0000 1.31
+++ WSDDDeployableItem.java 5 Jun 2002 21:49:20 -0000 1.32
@@ -63,6 +63,7 @@
import org.apache.axis.deployment.DeploymentRegistry;
import org.apache.axis.deployment.DeploymentException;
import org.apache.axis.utils.LockableHashtable;
+import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -342,11 +343,11 @@
try{
h.init();
}catch(Exception e){
- String msg=e + NL +stackToString(e);
+ String msg=e + NL + JavaUtils.stackToString(e);
log.debug(msg);
throw new ConfigurationException(e);
}catch(Error e){
- String msg=e + NL +stackToString(e);
+ String msg=e + NL + JavaUtils.stackToString(e);
log.debug(msg);
throw new ConfigurationException(msg);
}
@@ -385,13 +386,5 @@
return Class.forName(type.getLocalPart());
}
return null;
- }
-
- protected static String stackToString(Throwable e){
- java.io.StringWriter sw= new java.io.StringWriter(1024);
- java.io.PrintWriter pw= new java.io.PrintWriter(sw);
- e.printStackTrace(pw);
- pw.close();
- return sw.toString();
}
}
1.130 +3 -2 xml-axis/java/src/org/apache/axis/client/Call.java
Index: Call.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Call.java,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- Call.java 4 Jun 2002 22:58:32 -0000 1.129
+++ Call.java 5 Jun 2002 21:49:20 -0000 1.130
@@ -1179,7 +1179,7 @@
}
catch( Exception exp ) {
//if ( exp instanceof AxisFault ) throw (AxisFault) exp ;
- exp.printStackTrace();
+ log.info(JavaUtils.getMessage("toAxisFault00"), exp);
throw new AxisFault( JavaUtils.getMessage("errorInvoking00", "\n" +
exp) );
}
}
@@ -1232,6 +1232,7 @@
catch( Exception exp ) {
if ( exp instanceof AxisFault ) throw (AxisFault) exp ;
+ log.info(JavaUtils.getMessage("toAxisFault00"), exp);
throw new AxisFault( JavaUtils.getMessage("errorInvoking00", "\n" +
exp) );
}
}
@@ -1690,7 +1691,7 @@
invoke();
} catch (Exception e) {
- log.debug( JavaUtils.getMessage("exception00"), e );
+ log.info(JavaUtils.getMessage("toAxisFault00"), e);
throw AxisFault.makeFault(e);
}
1.34 +1 -8
xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java
Index: DeserializationContextImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- DeserializationContextImpl.java 31 May 2002 19:08:07 -0000 1.33
+++ DeserializationContextImpl.java 5 Jun 2002 21:49:20 -0000 1.34
@@ -509,14 +509,7 @@
try{
ret= attch.getAttachmentByReference(href);
}catch(AxisFault e){
- java.io.StringWriter sw= new java.io.StringWriter();
- java.io.PrintWriter pw= new java.io.PrintWriter(sw);
- e.printStackTrace(pw);
- pw.flush();
- RuntimeException rte=
- new RuntimeException(e.toString() + sw.toString());
- pw.close();
- throw rte;
+ throw new RuntimeException(e.toString() +
JavaUtils.stackToString(e));
}
}
}
1.108 +1 -1
xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java
Index: AxisServlet.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- AxisServlet.java 4 Jun 2002 22:58:32 -0000 1.107
+++ AxisServlet.java 5 Jun 2002 21:49:20 -0000 1.108
@@ -464,7 +464,7 @@
JavaUtils.getMessage("somethingWrong00") +
"</p>");
writer.println("<pre>Exception - " + e + "<br>");
- e.printStackTrace(res.getWriter());
+ writer.println(JavaUtils.stackToString(e));
writer.println("</pre>");
}
}
