[Yanel-commits] rev 56688 - public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources

Thu Feb 10 08:49:34 CET 2011

Author: michi
Date: 2011-02-10 08:49:33 +0100 (Thu, 10 Feb 2011)
New Revision: 56688

Modified:
   public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java
Log:
check if template actually exists

Modified: public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java
===================================================================

--- public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java	2011-02-10 07:34:18 UTC (rev 56687)
+++ public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java	2011-02-10 07:49:33 UTC (rev 56688)
@@ -389,10 +389,21 @@
 
             String templatePath = request.getParameter("rp.template");
             if (log.isDebugEnabled()) log.debug("Template path: " + templatePath);
-
-            if (templatePath != null) {
-                SourceResolver resolver = new SourceResolver(this);
-                Source src = resolver.resolve(templatePath, null);
+            SourceResolver resolver = new SourceResolver(this);
+            Source src = null;
+            try {
+                if (templatePath != null) {
+                    src = new SourceResolver(this).resolve(templatePath, null);
+                } else {
+                    log.info("No template path set!");
+                    src = null;
+                }
+            } catch(Exception e) {
+                log.error(e, e);
+                log.warn("Will fallback to hardcoded 'template'!");
+                src = null;
+            }
+            if (src != null) {
                 InputStream is = ((YanelStreamSource)src).getInputStream();
                 Document doc = XMLHelper.readDocument(is);
                 if (log.isDebugEnabled()) {
@@ -418,6 +429,9 @@
                 writer.write("<body>");
                 writer.write("  <h1>" + title + "</h1>");
                 writer.write("  <p>Edit this text with <a href=\"http://www.yulup.org\">Yulup</a>!</p>");
+                if (templatePath != null && src == null) {
+                    writer.write("  <p>WARNING: There seems to be a template '" + templatePath + "' configured, but which does not exist!</p>");
+                }
                 writer.write("</body>");
                 writer.write("</html>");
                 writer.close();

