svn commit: r701272 - /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/AbstractCachingGadgetHtmlParser.java

[jo...@apache.org]

Author: johnh
Date: Thu Oct  2 17:53:19 2008
New Revision: 701272

URL: http://svn.apache.org/viewvc?rev=701272&view=rev
Log:
Small bugfix accommodating non-deserializable content.


Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/AbstractCachingGadgetHtmlParser.java

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/AbstractCachingGadgetHtmlParser.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/AbstractCachingGadgetHtmlParser.java?rev=701272&r1=701271&r2=701272&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/AbstractCachingGadgetHtmlParser.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/AbstractCachingGadgetHtmlParser.java Thu Oct  2 17:53:19 2008
@@ -59,7 +59,11 @@
     String cacheKey = HashUtil.checksum(source.getBytes());
     byte[] cached = parseTreeCache.getElement(cacheKey);
     if (cached != null) {
-      return pts.deserialize(cached);
+      List<ParsedHtmlNode> ret = pts.deserialize(cached);
+      if (ret != null) {
+        // This might be null if the cached blob has timed out or has a different version.
+        return ret;
+      }
     }
     
     long parseStart = System.currentTimeMillis();