You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gr...@apache.org on 2001/01/17 21:45:21 UTC

cvs commit: xml-cocoon/src/org/apache/cocoon/processor/xsp XSPPage.java

greenrd     01/01/17 12:45:20

  Modified:    src/org/apache/cocoon/processor/xsp XSPPage.java
  Log:
  catch exception
  
  Revision  Changes    Path
  1.10      +10 -4     xml-cocoon/src/org/apache/cocoon/processor/xsp/XSPPage.java
  
  Index: XSPPage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xsp/XSPPage.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XSPPage.java	2001/01/17 16:02:20	1.9
  +++ XSPPage.java	2001/01/17 20:45:15	1.10
  @@ -1,4 +1,4 @@
  -/*-- $Id: XSPPage.java,v 1.9 2001/01/17 16:02:20 greenrd Exp $ -- 
  +/*-- $Id: XSPPage.java,v 1.10 2001/01/17 20:45:15 greenrd Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -64,7 +64,7 @@
   
   /**
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version $Revision: 1.9 $ $Date: 2001/01/17 16:02:20 $
  + * @version $Revision: 1.10 $ $Date: 2001/01/17 20:45:15 $
    */
   public abstract class XSPPage extends AbstractProducer implements Cacheable {
     protected Parser xspParser;
  @@ -142,7 +142,8 @@
       return factory.createTextNode(String.valueOf(v));
     }
   
  -  protected Node xspExpr(Object v, Document factory) {
  +  protected Node xspExpr(Object v, Document factory) 
  +  {
       // Null? blank text node
       if (v == null) {
         return factory.createTextNode("");
  @@ -175,7 +176,12 @@
       // Convertible to DOM
       if (v instanceof XMLFragment) {
         DocumentFragment fragment = factory.createDocumentFragment ();
  -      ((XMLFragment) v).toDOM(fragment);
  +      try {
  +        ((XMLFragment) v).toDOM(fragment);
  +      }
  +      catch (Exception ex) {
  +        throw new RuntimeException ("Error building DOM: " + ex);
  +      }
         return fragment;
       }