[jbpm-commits] JBoss JBPM SVN: r5184 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src/main: resources/org/jbpm/job and 1 other directory.

Author: alex.guizar(a)jboss.com Date: 2009-07-01 21:21:59 -0400 (Wed, 01 Jul 2009) New Revision: 5184 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/ExecuteActionJob.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/ExecuteNodeJob.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/Timer.hbm.xml Log: reattach job instead of loading it again Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2009-07-02 01:05:31 UTC (rev 5183) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2009-07-02 01:21:59 UTC (rev 5184) @@ -166,7 +166,7 @@ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { JobSession jobSession = jbpmContext.getJobSession(); - job = jobSession.loadJob(job.getId()); + jobSession.reattachJob(job); // register process instance for automatic save // see https://jira.jboss.org/jira/browse/JBPM-1015 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/ExecuteActionJob.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/ExecuteActionJob.hbm.xml 2009-07-02 01:05:31 UTC (rev 5183) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/ExecuteActionJob.hbm.xml 2009-07-02 01:21:59 UTC (rev 5184) @@ -12,7 +12,7 @@ <many-to-one name="action" column="ACTION_" - cascade="none" + cascade="lock" foreign-key="FK_JOB_ACTION" index="IDX_JOB_ACTION"/> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/ExecuteNodeJob.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/ExecuteNodeJob.hbm.xml 2009-07-02 01:05:31 UTC (rev 5183) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/ExecuteNodeJob.hbm.xml 2009-07-02 01:21:59 UTC (rev 5184) @@ -12,6 +12,7 @@ <many-to-one name="node" column="NODE_" + cascade="lock" foreign-key="FK_JOB_NODE" index="IDX_JOB_NODE"/> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml 2009-07-02 01:05:31 UTC (rev 5183) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml 2009-07-02 01:21:59 UTC (rev 5184) @@ -17,14 +17,17 @@ <many-to-one name="processInstance" column="PROCESSINSTANCE_" + cascade="lock" foreign-key="FK_JOB_PRINST" index="IDX_JOB_PRINST" /> <many-to-one name="token" column="TOKEN_" + cascade="lock" foreign-key="FK_JOB_TOKEN" index="IDX_JOB_TOKEN" /> <many-to-one name="taskInstance" column="TASKINSTANCE_" + cascade="lock" foreign-key="FK_JOB_TSKINST" index="IDX_JOB_TSKINST" /> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/Timer.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/Timer.hbm.xml 2009-07-02 01:05:31 UTC (rev 5183) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/Timer.hbm.xml 2009-07-02 01:21:59 UTC (rev 5184) @@ -16,10 +16,11 @@ <many-to-one name="action" column="ACTION_" + cascade="lock" foreign-key="FK_JOB_ACTION" index="IDX_JOB_ACTION"/> - <any name="graphElement" id-type="long" cascade="none"> + <any name="graphElement" id-type="long" cascade="lock"> <column name="GRAPHELEMENTTYPE_"/> <column name="GRAPHELEMENT_"/> </any>