You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2001/12/19 19:56:04 UTC
cvs commit: jakarta-turbine-3/src/java/org/apache/turbine Turbine.java
jmcnally 01/12/19 10:56:04
Modified: src/java/org/apache/turbine Turbine.java
Log:
fix formatting
Revision Changes Path
1.15 +69 -70 jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Turbine.java 2001/12/19 18:52:17 1.14
+++ Turbine.java 2001/12/19 18:56:04 1.15
@@ -118,7 +118,7 @@
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: Turbine.java,v 1.14 2001/12/19 18:52:17 jmcnally Exp $
+ * @version $Id: Turbine.java,v 1.15 2001/12/19 18:56:04 jmcnally Exp $
*/
public class Turbine
extends HttpServlet
@@ -391,78 +391,77 @@
}
else
{
- try
- {
- // try again with a different target
- data.setTarget(configuration
- .getString("template.error","/Error.vm"));
- data.setStackTrace(StringUtils.stackTrace(t), t);
- pipeline.execute(data);
- pipeline.finished(data);
- }
- catch (Exception f)
- {
- String mimeType = "text/plain";
-
- try
- {
- // This should be more useful and formatted in
- // a useful fashion but this will get rid of ECS
- // for the time being.
- String trace = StringUtils.stackTrace(t);
- data.setStackTrace(trace,t);
- data.getResponse().setContentType(data.getContentType());
- data.getResponse().setStatus(data.getStatusCode());
- data.getOut().print("<pre>\n" + trace + "\n</pre>");
- }
- // Catch this one because it occurs if some code hasn't been
- // completely re-compiled after a change..
- catch ( java.lang.NoSuchFieldError e )
- {
- try
- {
- data.getResponse().setContentType( mimeType );
- data.getResponse().setStatus ( 200 );
- }
- catch (Exception ignored) {}
-
- try
- {
- data.getOut().print ("java.lang.NoSuchFieldError: " +
- "Please recompile all of your " +
- "source code.");
- }
- catch (IOException ignored) {}
-
- Log.info ( data.getStackTrace() );
- Log.error ( e.getMessage(), e );
- }
- // Attempt to do *something* at this point...
- catch ( Throwable reallyScrewedNow )
- {
- StringBuffer msg = new StringBuffer();
- msg.append("Horrible Exception: ");
- if (data != null)
- {
- msg.append(data.getStackTrace());
- }
- else
- {
- msg.append(t);
- }
try
- {
- res.setContentType( mimeType );
- res.setStatus ( 200 );
- res.getWriter().print (msg.toString());
- }
- catch (Exception ignored)
{
- // ignored
+ // try again with a different target
+ data.setTarget(configuration
+ .getString("template.error","/Error.vm"));
+ data.setStackTrace(StringUtils.stackTrace(t), t);
+ pipeline.execute(data);
+ pipeline.finished(data);
+ }
+ catch (Exception f)
+ {
+ String mimeType = "text/plain";
+
+ try
+ {
+ // This should be more useful and formatted in
+ // a useful fashion but this will get rid of ECS
+ // for the time being.
+ String trace = StringUtils.stackTrace(t);
+ data.setStackTrace(trace,t);
+ data.getResponse().setContentType(data.getContentType());
+ data.getResponse().setStatus(data.getStatusCode());
+ data.getOut().print("<pre>\n" + trace + "\n</pre>");
+ }
+ // Catch this one because it occurs if some code hasn't been
+ // completely re-compiled after a change..
+ catch ( java.lang.NoSuchFieldError e )
+ {
+ try
+ {
+ data.getResponse().setContentType( mimeType );
+ data.getResponse().setStatus ( 200 );
+ }
+ catch (Exception ignored) {}
+
+ try
+ {
+ data.getOut().print ("java.lang.NoSuchFieldError: " +
+ "Please recompile all of your " +
+ "source code.");
+ }
+ catch (IOException ignored) {}
+
+ Log.info ( data.getStackTrace() );
+ Log.error ( e.getMessage(), e );
+ }
+ // Attempt to do *something* at this point...
+ catch ( Throwable reallyScrewedNow )
+ {
+ StringBuffer msg = new StringBuffer();
+ msg.append("Horrible Exception: ");
+ if (data != null)
+ {
+ msg.append(data.getStackTrace());
+ }
+ else
+ {
+ msg.append(t);
+ }
+ try
+ {
+ res.setContentType( mimeType );
+ res.setStatus ( 200 );
+ res.getWriter().print (msg.toString());
+ }
+ catch (Exception ignored)
+ {
+ }
+ Log.error(reallyScrewedNow.getMessage(), reallyScrewedNow);
+ }
}
- Log.error (reallyScrewedNow.getMessage(), reallyScrewedNow );
- }
- }
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>