[Yanel-commits] rev 48113 - public/yanel/trunk/src/core/java/org/wyona/yanel/core/workflow

[michi at wyona.com]

Author: michi
Date: 2010-03-15 21:58:36 +0100 (Mon, 15 Mar 2010)
New Revision: 48113

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/workflow/WorkflowHelper.java
Log:
use hasProperty instead just checking null and Category replaced by Logger

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/workflow/WorkflowHelper.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/workflow/WorkflowHelper.java	2010-03-15 20:56:45 UTC (rev 48112)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/workflow/WorkflowHelper.java	2010-03-15 20:58:36 UTC (rev 48113)
@@ -18,7 +18,8 @@
 import java.io.InputStream;
 import java.util.Date;
 
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
+
 import org.wyona.yanel.core.Resource;
 import org.wyona.yanel.core.api.attributes.VersionableV2;
 import org.wyona.yanel.core.api.attributes.ViewableV2;
@@ -42,7 +43,7 @@
  */
 public class WorkflowHelper {
     
-    private static Category log = Category.getInstance(WorkflowHelper.class);
+    private static Logger log = Logger.getLogger(WorkflowHelper.class);
 
     protected static final String LIVE_REVISION_PROPERTY = "live-revision";
     protected static final String WORKFLOW_DATE_PROPERTY = "workflow-date";
@@ -287,10 +288,15 @@
     }
 
     /**
-     *
+     * Get workflow variable value, e.g. value of live-revision
+     * @param name Name of workflow variable
      */
     public static String getWorkflowVariable(Node node, String name) throws WorkflowException {
         try {
+            if (!node.hasProperty(name)) {
+                log.warn("No such property: " + name);
+                return null;
+            }
             Property property = node.getProperty(name);
             if (property != null) {
                 return property.getString();