Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 95294 invoked from network); 6 Jan 2009 00:14:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Jan 2009 00:14:24 -0000 Received: (qmail 38996 invoked by uid 500); 6 Jan 2009 00:14:22 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 38907 invoked by uid 500); 6 Jan 2009 00:14:22 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 38898 invoked by uid 99); 6 Jan 2009 00:14:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 16:14:22 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jan 2009 00:14:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 70D192388892; Mon, 5 Jan 2009 16:14:01 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r731781 - in /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml: env/javascript/JSEvaluator.java io/SCXMLParser.java io/SCXMLSerializer.java model/Assign.java Date: Tue, 06 Jan 2009 00:14:01 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090106001401.70D192388892@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Mon Jan 5 16:14:00 2009 New Revision: 731781 URL: http://svn.apache.org/viewvc?rev=731781&view=rev Log: SCXML-103 Remove any catch (Throwable t) occurences: Catch specific Exceptions/Errors rather than generic ones Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSEvaluator.java commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Assign.java Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSEvaluator.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSEvaluator.java?rev=731781&r1=731780&r2=731781&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSEvaluator.java (original) +++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSEvaluator.java Mon Jan 5 16:14:00 2009 @@ -25,6 +25,7 @@ import javax.script.ScriptContext; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; +import javax.script.ScriptException; import org.apache.commons.scxml.Builtin; import org.apache.commons.scxml.Context; @@ -126,7 +127,7 @@ // ... evaluate return engine.eval(buffer.toString(),new JSBindings(context,bindings)); - } catch (Throwable x) { + } catch (ScriptException x) { throw new SCXMLExpressionException("Error evaluating ['" + expression + "'] " + x); } } @@ -192,7 +193,7 @@ // ... evaluate return (Node) engine.eval(buffer.toString(),new JSBindings(context,bindings)); - } catch (Throwable x) { + } catch (ScriptException x) { throw new SCXMLExpressionException("Error evaluating ['" + expression + "'] " + x); } } Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java?rev=731781&r1=731780&r2=731781&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java (original) +++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java Mon Jan 5 16:14:00 2009 @@ -24,6 +24,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.digester.Digester; @@ -1398,16 +1399,29 @@ newInstance(); DocumentBuilder db = dbFactory.newDocumentBuilder(); attrNode = db.parse(path); - } catch (Throwable t) { // you read that correctly - org.apache.commons.logging.Log log = LogFactory. - getLog(SCXMLParser.class); - log.error(t.getMessage(), t); + } catch (FactoryConfigurationError t) { + logError(t); + } catch (ParserConfigurationException t) { + logError(t); + } catch (SAXException t) { + logError(t); + } catch (IOException t) { + logError(t); } return; } } /** + * @param throwable + */ + private void logError(Throwable throwable) { + org.apache.commons.logging.Log log = LogFactory. + getLog(SCXMLParser.class); + log.error(throwable.getMessage(), throwable); + } + + /** * @see Rule#end(String, String) */ @Override Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java?rev=731781&r1=731780&r2=731781&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java (original) +++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java Mon Jan 5 16:14:00 2009 @@ -26,8 +26,10 @@ import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; +import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; @@ -637,7 +639,9 @@ TransformerFactory tfFactory = TransformerFactory.newInstance(); transformer = tfFactory.newTransformer(); transformer.setOutputProperties(outputProps); - } catch (Throwable t) { + } catch (TransformerFactoryConfigurationError t) { + return null; + } catch (TransformerConfigurationException e) { return null; } return transformer; Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Assign.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Assign.java?rev=731781&r1=731780&r2=731781&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Assign.java (original) +++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Assign.java Mon Jan 5 16:14:00 2009 @@ -16,9 +16,12 @@ */ package org.apache.commons.scxml.model; +import java.io.IOException; import java.util.Collection; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.FactoryConfigurationError; +import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -34,6 +37,7 @@ import org.apache.commons.scxml.semantics.ErrorConstants; import org.w3c.dom.Document; import org.w3c.dom.Node; +import org.xml.sax.SAXException; /** * The class in this SCXML object model that corresponds to the @@ -268,10 +272,14 @@ try { doc = DocumentBuilderFactory.newInstance().newDocumentBuilder(). parse(resolvedSrc); - } catch (Throwable t) { - org.apache.commons.logging.Log log = LogFactory. - getLog(Assign.class); - log.error(t.getMessage(), t); + } catch (FactoryConfigurationError t) { + logError(t); + } catch (SAXException e) { + logError(e); + } catch (IOException e) { + logError(e); + } catch (ParserConfigurationException e) { + logError(e); } if (doc == null) { return null; @@ -279,4 +287,13 @@ return doc.getDocumentElement(); } + /** + * @param throwable + */ + private void logError(Throwable throwable) { + org.apache.commons.logging.Log log = LogFactory. + getLog(Assign.class); + log.error(throwable.getMessage(), throwable); + } + }