cmailleux 2005/12/12 12:55:37 CET
Modified files:
core/src/java/org/jahia/workflow/nstep NStepWorkflow.java
Log:
Avoid ressource excpetion on startstep
Revision Changes Path
1.16 +9 -2
jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java.diff?r1=1.15&r2=1.16&f=h
Index: NStepWorkflow.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- NStepWorkflow.java 12 Dec 2005 11:48:18 -0000 1.15
+++ NStepWorkflow.java 12 Dec 2005 11:55:37 -0000 1.16
@@ -44,15 +44,18 @@
* Time: 14:53:40
*
* @author [EMAIL PROTECTED]
- * @version $Id: NStepWorkflow.java,v 1.15 2005/12/12 11:48:18 cmailleux Exp
$
+ * @version $Id: NStepWorkflow.java,v 1.16 2005/12/12 11:55:37 cmailleux Exp
$
* <p/>
* Revision log :
* $Log: NStepWorkflow.java,v $
+ * Revision 1.16 2005/12/12 11:55:37 cmailleux
+ * Avoid ressource excpetion on startstep
+ *
* Revision 1.15 2005/12/12 11:48:18 cmailleux
- * Only Member of admin group can steal workflow lock
- *
- * Root is allowed to make all step of an NStep Workflow
- *
+ * Only Member of admin group can steal workflow lock
+ *
+ * Root is allowed to make all step of an NStep Workflow
+ *
* Correctly close lock engine when clicking cancel
*
* Revision 1.14 2005/12/07 14:17:08 cmailleux
@@ -695,7 +698,7 @@
workflow.getAuthorEmail());
final String username = author.getUsername();
String processName =
trimActionName(workflow.getWorkflow().getName().toLowerCase());
- String subject = getKey("process." + processName + ".mail.subject",
workflow, jParams, displayName, comment, username, curStep,
+ String subject = getKey("process." + processName + ".mail.subject",
workflow, jParams, displayName, comment, username, (startStep)?null:curStep,
nextStep, contentObjectInstance);
jParams.removeAttribute("org.jahia.engines.workflow.notify.from");
jParams.removeAttribute("org.jahia.engines.workflow.notify.cc");
