Return-Path: 
 <commons-dev-return-7578-jakarta-archive-commons-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@apache.org
Received: (qmail 58781 invoked from network); 5 May 2002 06:59:57 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 5 May 2002 06:59:57 -0000
Received: (qmail 18085 invoked by uid 97); 5 May 2002 07:00:08 -0000
Delivered-To: qmlist-jakarta-archive-commons-dev@nagoya.betaversion.org
Received: (qmail 17988 invoked by alias); 5 May 2002 07:00:08 -0000
Delivered-To: jakarta-archive-commons-dev@jakarta.apache.org
Received: (qmail 17949 invoked by uid 97); 5 May 2002 07:00:07 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:commons-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 17938 invoked by alias); 5 May 2002 07:00:06 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 5 May 2002 06:59:49 -0000
Message-ID: <20020505065949.39164.qmail@icarus.apache.org>
From: dion@apache.org
To: jakarta-commons-cvs@apache.org
Subject: cvs commit:
 jakarta-commons/latka/src/java/org/apache/commons/latka/validators
 XPathValidator.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

dion        02/05/04 23:59:49

  Modified:    latka/src/java/org/apache/commons/latka/validators
                        XPathValidator.java
  Log:
  Added exception handling to allow Gump builds to proceed. JDOM b8 doesn't throw IOExceptions,
  but the latest code in CVS does.
  The compiler wont let you catch an exception that isn't being thrown, so simply
  adding catch IOException to the code would break people build on released versions of jdom.
  Hence the ugly workaround
  
  Revision  Changes    Path
  1.5       +9 -4      jakarta-commons/latka/src/java/org/apache/commons/latka/validators/XPathValidator.java
  
  Index: XPathValidator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/validators/XPathValidator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XPathValidator.java	2 May 2002 22:25:44 -0000	1.4
  +++ XPathValidator.java	5 May 2002 06:59:49 -0000	1.5
  @@ -57,9 +57,10 @@
   
   package org.apache.commons.latka.validators;
   
  +import java.io.IOException;
  +
   import org.apache.commons.latka.Validator;
   import org.apache.commons.latka.ValidationException;
  -
   import org.apache.commons.latka.http.Response;
   
   import org.jdom.Document;
  @@ -112,7 +113,7 @@
    * @author <a href="mailto:jefft@apache.org">Jeff Turner</a>
    * @author dIon Gillard
    * @since 6 January, 2001
  - * @version $Id: XPathValidator.java,v 1.4 2002/05/02 22:25:44 morgand Exp $
  + * @version $Id: XPathValidator.java,v 1.5 2002/05/05 06:59:49 dion Exp $
    */
   public class XPathValidator extends BaseConditionalValidator {
   
  @@ -298,8 +299,12 @@
           SAXBuilder builder = new SAXBuilder();
           try {
               doc = builder.build(response.getStream());
  -        } catch (JDOMException e) {
  -            fail(e.toString());
  +        } catch (Exception e) {
  +            if (e instanceof IOException || e instanceof JDOMException) {
  +                fail(e.toString());
  +            } else {
  +                fail("Unknown exception caught: " + e.toString());
  +            }
           }
           if (doc == null) { // this should never happen
               fail("Null document");
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>