1:58 a.m.
Author: camunda
Date: 2008-12-09 02:58:33 -0500 (Tue, 09 Dec 2008)
New Revision: 3277
Added:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ExceptionHandlerTest.java
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java
Log:
JBPM-1887: Fixed bug in ExceptionHandler causing infinite loop
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java 2008-12-08
23:03:08 UTC (rev 3276)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java 2008-12-09
07:58:33 UTC (rev 3277)
@@ -268,10 +268,22 @@
// log the action exception
actionLog.setException(exception);
-
- // if an exception handler is available
- raiseException(exception, executionContext);
-
+
+ // If an exception is already set we are in an action of an exception handler
+ // in this case don't give the exception to the handlers but throw it to the
client
+ // see https://jira.jboss.org/jira/browse/JBPM-1887
+ if (executionContext.getException()==null) {
+ // if an exception handler is available
+ raiseException(exception, executionContext);
+ }
+ else {
+ // if there is no parent we need to throw an action exception to the client
+ if (exception instanceof JbpmException) {
+ throw (JbpmException) exception;
+ } else {
+ throw new DelegationException(exception, executionContext);
+ }
+ }
} finally {
executionContext.setAction(null);
token.endCompositeLog();
Added:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ExceptionHandlerTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ExceptionHandlerTest.java
(rev 0)
+++
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ExceptionHandlerTest.java 2008-12-09
07:58:33 UTC (rev 3277)
@@ -0,0 +1,135 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.graph.def;
+
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.graph.exe.ExecutionContext;
+import org.jbpm.graph.exe.ProcessInstance;
+
+/**
+ *
+ * @author bernd.ruecker(a)camunda.com
+ */
+public class ExceptionHandlerTest extends AbstractJbpmTestCase {
+
+ public static class NoExceptionAction implements ActionHandler {
+ public void execute(ExecutionContext executionContext) throws Exception {
+ }
+ }
+ public static class ThrowExceptionAction implements ActionHandler {
+ public void execute(ExecutionContext executionContext) throws Exception {
+ throw new Exception("exception in action handler");
+ }
+ }
+ public static class ThrowInnerExceptionAction implements ActionHandler {
+ public void execute(ExecutionContext executionContext) throws Exception {
+ throw new Exception("exception inside of exception handler");
+ }
+ }
+
+ public void testExceptionHandlerThrowingExcption() {
+
+ String xml =
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +"<process-definition name='TestException'>"
+ +" <start-state name='start'>"
+ +" <transition name='to_state' to='first'>"
+ +" <action
class='org.jbpm.graph.def.ExceptionHandlerTest$ThrowExceptionAction' />"
+ +" </transition>"
+ +" </start-state> "
+ +" <state name='first'>"
+ +" <transition to='end' />"
+ +" </state> "
+ +" <end-state name='end' />"
+ +" <exception-handler>"
+ +" <action
class='org.jbpm.graph.def.ExceptionHandlerTest$ThrowInnerExceptionAction'
/>"
+ +" </exception-handler>"
+ +"</process-definition>";
+
+ ProcessDefinition def = ProcessDefinition.parseXmlString(xml);
+ ProcessInstance pi = def.createProcessInstance();
+
+ try {
+ pi.getRootToken().signal();
+ }
+ catch (DelegationException ex) {
+ ex.printStackTrace();
+ // check that exception is thrown to the client nested in a DelegationException
+ assertEquals("exception inside of exception handler",
ex.getCause().getMessage());
+ }
+ }
+
+ public void testMissingExceptionHandlerClass() {
+ String xml =
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +"<process-definition name='TestException'>"
+ +" <start-state name='start'>"
+ +" <transition name='to_state' to='first'>"
+ +" <action
class='org.jbpm.graph.def.ExceptionHandlerTest$ThrowExceptionAction' />"
+ +" </transition>"
+ +" </start-state> "
+ +" <state name='first'>"
+ +" <transition to='end' />"
+ +" </state> "
+ +" <end-state name='end' />"
+ +" <exception-handler>"
+ +" <action
class='org.jbpm.graph.def.ExceptionHandlerTest$DOESNTEXIST' />"
+ +" </exception-handler>"
+ +"</process-definition>";
+
+ ProcessDefinition def = ProcessDefinition.parseXmlString(xml);
+ ProcessInstance pi = def.createProcessInstance();
+
+ try {
+ pi.getRootToken().signal();
+ }
+ catch (DelegationException ex) {
+ // check that exception is thrown to the client nested in a DelegationException
+ assertEquals(NullPointerException.class, ex.getCause().getClass());
+ }
+ }
+
+ public void testNoException() {
+ String xml =
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ +"<process-definition name='TestException'>"
+ +" <start-state name='start'>"
+ +" <transition name='to_state' to='first'>"
+ +" <action
class='org.jbpm.graph.def.ExceptionHandlerTest$ThrowExceptionAction' />"
+ +" </transition>"
+ +" </start-state> "
+ +" <state name='first'>"
+ +" <transition to='end' />"
+ +" </state> "
+ +" <end-state name='end' />"
+ +" <exception-handler>"
+ +" <action
class='org.jbpm.graph.def.ExceptionHandlerTest$NoExceptionAction' />"
+ +" </exception-handler>"
+ +"</process-definition>";
+
+ ProcessDefinition def = ProcessDefinition.parseXmlString(xml);
+ ProcessInstance pi = def.createProcessInstance();
+ pi.getRootToken().signal();
+
+ // exception is handled correctly
+ }
+}