Skip to content

Commit

Permalink
Merge branch 'main' of github.com:flowable/flowable-engine into flowa…
Browse files Browse the repository at this point in the history 
…ble-release-7.0.0
  • Loading branch information
@tijsrademakers
tijsrademakers committed Nov 15, 2023
2 parents 77b93fe + f4ba2b2 commit cb9fbf8
Show file tree
Hide file tree
Showing 24 changed files with 390 additions and 167 deletions.
1 change: 1 addition & 0 deletions docs/public-api/tools/flowable-rest-asciidoc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
Expand Down
16 changes: 4 additions & 12 deletions modules/flowable-app-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-copy-logging</id>
Expand Down Expand Up @@ -301,10 +299,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -358,10 +354,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -415,10 +409,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down
18 changes: 5 additions & 13 deletions modules/flowable-cmmn-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-copy-logging</id>
Expand Down Expand Up @@ -375,10 +373,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -432,10 +428,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -489,10 +483,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -647,8 +639,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down
7 changes: 4 additions & 3 deletions ...e/src/main/java/org/flowable/cmmn/engine/impl/callback/DefaultInternalCmmnJobManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,14 @@ protected void handleJobDeleteInternal(Job job) {
@Override
protected void lockJobScopeInternal(Job job) {
CaseInstanceEntityManager caseInstanceEntityManager = cmmnEngineConfiguration.getCaseInstanceEntityManager();
String lockOwner;
Date lockExpirationTime;
String lockOwner = null;
Date lockExpirationTime = null;

if (job instanceof JobInfoEntity) {
lockOwner = ((JobInfoEntity) job).getLockOwner();
lockExpirationTime = ((JobInfoEntity) job).getLockExpirationTime();
} else {
}
if (lockOwner == null || lockExpirationTime == null) {
int lockMillis = cmmnEngineConfiguration.getAsyncExecutor().getAsyncJobLockTimeInMillis();
GregorianCalendar lockCal = new GregorianCalendar();
lockCal.setTime(cmmnEngineConfiguration.getClock().getCurrentTime());
Expand Down
16 changes: 4 additions & 12 deletions modules/flowable-dmn-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>error-logging</id>
Expand Down Expand Up @@ -273,10 +271,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be a bug with antrun
see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -325,10 +321,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be a bug with antrun
see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -377,10 +371,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be a bug with antrun
see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down
57 changes: 18 additions & 39 deletions modules/flowable-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -536,10 +534,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -593,10 +589,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -656,9 +650,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>

<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -718,10 +711,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -781,10 +772,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -818,10 +807,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>configExecution</id>
Expand Down Expand Up @@ -890,10 +877,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>configExecution</id>
Expand Down Expand Up @@ -966,8 +951,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -1013,10 +998,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -1085,10 +1068,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -1157,8 +1138,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -1205,8 +1186,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -1266,8 +1247,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -1330,8 +1311,8 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -1396,8 +1377,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>database-test-create-schema</id>
Expand Down Expand Up @@ -1580,10 +1561,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<!-- only worked with this version, there might be
a bug with antrun see http://jira.codehaus.org/browse/MANTRUN-109 -->
<version>1.4</version>
<executions>
<execution>
<id>database-copy-logging</id>
Expand Down Expand Up @@ -1620,8 +1599,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>change config</id>
Expand Down
8 changes: 5 additions & 3 deletions ...flowable-engine/src/main/java/org/flowable/engine/impl/cfg/DefaultInternalJobManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,15 @@ protected void lockJobScopeInternal(Job job) {
ExecutionEntityManager executionEntityManager = getExecutionEntityManager();
ExecutionEntity execution = executionEntityManager.findById(job.getExecutionId());
if (execution != null) {
String lockOwner;
Date lockExpirationTime;
String lockOwner = null;
Date lockExpirationTime = null;

if (job instanceof JobInfoEntity) {
lockOwner = ((JobInfoEntity) job).getLockOwner();
lockExpirationTime = ((JobInfoEntity) job).getLockExpirationTime();
} else {
}

if (lockOwner == null || lockExpirationTime == null) {
int lockMillis = processEngineConfiguration.getAsyncExecutor().getAsyncJobLockTimeInMillis();
GregorianCalendar lockCal = new GregorianCalendar();
lockCal.setTime(processEngineConfiguration.getClock().getCurrentTime());
Expand Down
Loading

0 comments on commit cb9fbf8

Please sign in to comment.