[Yanel-commits] rev 35274 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2008-04-11 16:01:49 +0200 (Fri, 11 Apr 2008)
New Revision: 35274

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
resource not found exception added

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2008-04-11 14:01:07 UTC (rev 35273)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2008-04-11 14:01:49 UTC (rev 35274)
@@ -477,12 +477,17 @@
                             log.warn(message);
                             do404(request, response, doc, message);
                             return;
+                        } catch(org.wyona.yanel.core.ResourceNotFoundException e) {
+                            String message = "" + e;
+                            log.warn(message);
+                            do404(request, response, doc, message);
+                            return;
                         }
                     } else {
-                         Element noViewElement = (Element) resourceElement.appendChild(doc.createElement("not-viewable"));
-                         String message = res.getClass().getName() + " is not viewable! (" + res.getPath() + ", " + res.getRealm() + ")";
-                         noViewElement.appendChild(doc.createTextNode(res.getClass().getName() + " is not viewable!"));
-                         log.error(message);
+                        Element noViewElement = (Element) resourceElement.appendChild(doc.createElement("not-viewable"));
+                        String message = res.getClass().getName() + " is not viewable! (" + res.getPath() + ", " + res.getRealm() + ")";
+                        noViewElement.appendChild(doc.createTextNode(res.getClass().getName() + " is not viewable!"));
+                        log.error(message);
                          Element exceptionElement = (Element) rootElement.appendChild(doc.createElementNS(NAMESPACE, "exception"));
                          exceptionElement.appendChild(doc.createTextNode(message));
                          exceptionElement.setAttributeNS(NAMESPACE, "status", "501");
@@ -566,6 +571,11 @@
                 log.warn(e, e);
                 do404(request, response, doc, message);
                 return;
+            } catch(org.wyona.yanel.core.ResourceNotFoundException e) {
+                String message = "" + e;
+                log.warn(e, e);
+                do404(request, response, doc, message);
+                return;
             } catch(Exception e) {
                 log.error(e.getMessage(), e);
                 String message = e.toString() + "\n\n" + getStackTrace(e);