[MMBASE CVS] src/org/mmbase/framework ConnectionRenderer.java ErrorRenderer.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv8757

Modified Files:
        ConnectionRenderer.java ErrorRenderer.java 
Log Message:
fixed invalid html on error


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework


Index: ConnectionRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ConnectionRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ConnectionRenderer.java     23 Feb 2008 12:15:54 -0000      1.3
+++ ConnectionRenderer.java     23 Feb 2008 12:44:03 -0000      1.4
@@ -27,7 +27,7 @@
  * A Renderer implementation based on an external connection.
  *
  * @author Michiel Meeuwissen
- * @version $Id: ConnectionRenderer.java,v 1.3 2008/02/23 12:15:54 michiel Exp 
$
+ * @version $Id: ConnectionRenderer.java,v 1.4 2008/02/23 12:44:03 michiel Exp 
$
  * @since MMBase-1.9
  */
 public class ConnectionRenderer extends AbstractRenderer {
@@ -101,10 +101,6 @@
             } else {
                 throw new FrameworkException("" + responseCode);
             }
-            if (decorate) {
-                HttpServletRequest request   = 
blockParameters.get(Parameter.REQUEST);
-                decorateOutro(request, w);
-            }
         } catch (java.net.ConnectException ce) {
             throw new FrameworkException(ce.getMessage(), ce);
         } catch (java.net.SocketTimeoutException ste) {
@@ -113,6 +109,14 @@
             throw new FrameworkException(ioe.getMessage(), ioe);
         } catch (javax.xml.transform.TransformerException te) {
             throw new FrameworkException(te.getMessage(), te);
+        } finally {
+            if (decorate) {
+                try {
+                    HttpServletRequest request   = 
blockParameters.get(Parameter.REQUEST);
+                    decorateOutro(request, w);
+                } catch (Exception e) {
+                }
+            }
         }
 
     }


Index: ErrorRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ErrorRenderer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ErrorRenderer.java  23 Feb 2008 12:15:54 -0000      1.10
+++ ErrorRenderer.java  23 Feb 2008 12:44:03 -0000      1.11
@@ -29,7 +29,7 @@
  * share code.
  *
  * @author Michiel Meeuwissen
- * @version $Id: ErrorRenderer.java,v 1.10 2008/02/23 12:15:54 michiel Exp $
+ * @version $Id: ErrorRenderer.java,v 1.11 2008/02/23 12:44:03 michiel Exp $
  * @since MMBase-1.9
  */
 
@@ -68,7 +68,7 @@
                 CharTransformer escape = new Xml(Xml.ESCAPE);
                 w.write(escape.transform(error.exception.getMessage()));
                 w.write(" ");
-                w.write(url);
+                w.write(escape.transform(url));
                 w.write("</h1>");
                 w.write("<pre>");
                 error.getErrorReport(w, request, escape);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs