bloritsch    02/01/10 12:11:47

  Modified:    src/java/org/apache/cocoon Main.java
  Log:
  more localized catch of last RNFE
  
  Revision  Changes    Path
  1.6       +15 -15    xml-cocoon2/src/java/org/apache/cocoon/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Main.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Main.java 10 Jan 2002 20:03:16 -0000      1.5
  +++ Main.java 10 Jan 2002 20:11:46 -0000      1.6
  @@ -97,7 +97,7 @@
    * Command line entry point.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2002/01/10 20:03:16 $
  + * @version CVS $Revision: 1.6 $ $Date: 2002/01/10 20:11:46 $
    */
   public class Main {
   
  @@ -557,22 +557,18 @@
           while (links.size() > 0) {
               String url = (String)links.get(0);
               if (allProcessedLinks.get(url) == null) {
  -                try {
  -                    if (xspOnly) {
  -                        this.processXSP(url);
  -                    } else if (this.followLinks) {
  -                        i = this.processURI(url).iterator();
  -                        while (i.hasNext() == true) {
  -                            next = (String)i.next();
  -                            if (links.contains(next) == false) {
  -                                links.add(next);
  -                            }
  +                if (xspOnly) {
  +                    this.processXSP(url);
  +                } else if (this.followLinks) {
  +                    i = this.processURI(url).iterator();
  +                    while (i.hasNext() == true) {
  +                        next = (String)i.next();
  +                        if (links.contains(next) == false) {
  +                            links.add(next);
                           }
  -                    } else {
  -                        this.processURI(url);
                       }
  -                } catch (ResourceNotFoundException rfne) {
  -                    log.warn("    Could not process uri: " + url);
  +                } else {
  +                    this.processURI(url);
                   }
               }
               links.remove(url);
  @@ -852,7 +848,11 @@
                           links,
                           stream,
                           this.log);
  +        try {
           cocoon.process(env);
  +        } catch (ResourceNotFoundException rnfe) {
  +            this.log.warn("Could not process URI: " + deparameterizedURI);
  +        }
           return env.getContentType();
       }
   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to