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

[michi at wyona.com]

Author: michi
Date: 2009-02-02 09:32:52 +0100 (Mon, 02 Feb 2009)
New Revision: 41245

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/RevisionInformationMenuItem.java
Log:
check if workflow state is null

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/RevisionInformationMenuItem.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/RevisionInformationMenuItem.java	2009-02-02 08:13:28 UTC (rev 41244)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/RevisionInformationMenuItem.java	2009-02-02 08:32:52 UTC (rev 41245)
@@ -77,8 +77,13 @@
         value += "<li>Comment: " + this.revisionInfo.getComment() + "</li>";
         if (workflowableRes != null) {
             try {
-                value += "<li>Workflow state: " + workflowableRes.getWorkflowState(revisionInfo.getName()) + "</li>";
-                value += "<li>Transition date: " + formatDate(workflowableRes.getWorkflowDate(revisionInfo.getName())) + "</li>";
+                String wfState = workflowableRes.getWorkflowState(revisionInfo.getName());
+                if (wfState != null) {
+                    value += "<li>Workflow state: " + wfState + "</li>";
+                    value += "<li>Transition date: " + formatDate(workflowableRes.getWorkflowDate(revisionInfo.getName())) + "</li>";
+                } else {
+                    log.warn("Workflow state of revision '" + revisionInfo.getName() + "' is null. Maybe workflow was enabled at some later stage and hence this revision has no workflow!");
+                }
             } catch(Exception e) {
                 log.error(e, e);
             }