From 35af5f53d7db414a14e5ff232a4ce060579fd7cf Mon Sep 17 00:00:00 2001
From: "bernd.ruecker" <bernd.ruecker@51b7ce9a-3489-0410-86de-dc9a27cf12c7>
Date: Thu, 16 Feb 2012 14:38:31 +0000
Subject: [PATCH] added parsing error instead of NPE with unconfigured timer

---
 .../org/activiti/engine/impl/bpmn/parser/BpmnParse.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
index 3617eff4fd..2e936e2f29 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
@@ -2202,18 +2202,20 @@ public class BpmnParse extends Parse {
     // TimeDate
     TimerDeclarationType type = TimerDeclarationType.DATE;
     Expression expression = parseExpression(timerEventDefinition, "timeDate");
-
     // TimeCycle
     if (expression == null) {
       type = TimerDeclarationType.CYCLE;
       expression = parseExpression(timerEventDefinition, "timeCycle");
     }
-
     // TimeDuration
     if (expression == null) {
       type = TimerDeclarationType.DURATION;
       expression = parseExpression(timerEventDefinition, "timeDuration");
-    }
+    }    
+    // neither date, cycle or duration configured!
+    if (expression==null) {
+      addError("Timer needs configuration (either timeDate, timeCycle or timeDuration is needed).", timerEventDefinition);      
+    }    
 
     // Parse the timer declaration
     // TODO move the timer declaration into the bpmn activity or next to the
-- 
GitLab