[HippoCMS-svn] [20626] ecm/site-toolkit: HSTTWO-432 check for valid uuid

[bvdschans]

Revision: 20626
Author:   aschrijvers
Date:     2009-11-11 12:34:38 +0100 (Wed, 11 Nov 2009)
Log Message:
-----------
HSTTWO-432 check for valid uuid

Modified Paths:
--------------
    ecm/site-toolkit/branches/Branch-HSTTWO-v2_02_xx/core/src/main/java/org/hippoecm/hst/core/template/tag/GalleryImageLinkTag.java

Modified: ecm/site-toolkit/branches/Branch-HSTTWO-v2_02_xx/core/src/main/java/org/hippoecm/hst/core/template/tag/GalleryImageLinkTag.java
===================================================================
--- ecm/site-toolkit/branches/Branch-HSTTWO-v2_02_xx/core/src/main/java/org/hippoecm/hst/core/template/tag/GalleryImageLinkTag.java 2009-11-11 05:07:43 UTC (rev 20625)
+++ ecm/site-toolkit/branches/Branch-HSTTWO-v2_02_xx/core/src/main/java/org/hippoecm/hst/core/template/tag/GalleryImageLinkTag.java 2009-11-11 11:34:38 UTC (rev 20626)
@@ -25,6 +25,7 @@
 import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
 
+import org.apache.jackrabbit.uuid.UUID;
 import org.hippoecm.hst.core.filters.base.HstRequestContext;
 import org.hippoecm.hst.core.template.node.el.ELNode;
 import org.slf4j.Logger;
@@ -56,7 +57,14 @@
                     if (imageNode != null) {
                         if (imageNode.hasProperty("hippo:docbase")) {
                             Node facetedNode = null;
-                            facetedNode = imageNode.getSession().getNodeByUUID(imageNode.getProperty("hippo:docbase").getValue().getString());
+                            String uuid = imageNode.getProperty("hippo:docbase").getValue().getString();
+                            try {
+                                UUID.fromString(uuid);  
+                            } catch (IllegalArgumentException e) {
+                                log.debug("Skipping invalid uuid '{}'", uuid);
+                                return;
+                            }
+                            facetedNode = imageNode.getSession().getNodeByUUID(uuid);
                             String nodeName = facetedNode.getName();
                             if (nodeName != null && !nodeName.equals("") && facetedNode.hasNode(nodeName)) {
                                 Node childFacetNode = facetedNode.getNode(facetedNode.getName());

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@...
http://lists.hippo.nl/mailman/listinfo/hippocms-svn