You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by jo...@apache.org on 2010/07/26 22:56:38 UTC
svn commit: r979434 -
/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
Author: johnh
Date: Mon Jul 26 20:56:38 2010
New Revision: 979434
URL: http://svn.apache.org/viewvc?rev=979434&view=rev
Log:
Catch common NPE condition in GadgetHtmlParser, converting to GadgetException.
A temporary bit of logic, which improves the error condition in this case.
Patch provided by Gagan Singh.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java?rev=979434&r1=979433&r2=979434&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java Mon Jul 26 20:56:38 2010
@@ -90,13 +90,14 @@ public abstract class GadgetHtmlParser {
if (document == null) {
try {
document = parseDomImpl(source);
- } catch (GadgetException e) {
- throw e;
} catch (DOMException e) {
// DOMException is a RuntimeException
document = errorDom(e);
HtmlSerialization.attach(document, serializerProvider.get(), source);
return document;
+ } catch (NullPointerException e) {
+ throw new GadgetException(GadgetException.Code.INTERNAL_SERVER_ERROR,
+ "Caught exception in parseDomImpl", e);
}
HtmlSerialization.attach(document, serializerProvider.get(), source);