Skip to content

Commit 892a823

Browse files
committed
updated release to 9.2
1 parent 152aa0e commit 892a823

File tree

43 files changed

+134
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+134
-114
lines changed

logicaldoc-android/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.logicaldoc</groupId>
88
<artifactId>logicaldoc</artifactId>
9-
<version>9.1.1</version>
9+
<version>9.2</version>
1010
</parent>
1111
<artifactId>logicaldoc-android</artifactId>
1212
<name>logicaldoc-android</name>

logicaldoc-android/src/main/resources/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<!ELEMENT value (#PCDATA)>
8989
]>
9090

91-
<plugin id="logicaldoc-android" version="9.1.1" class="com.logicaldoc.android.AndroidPlugin">
91+
<plugin id="logicaldoc-android" version="9.2" class="com.logicaldoc.android.AndroidPlugin">
9292
<requires>
9393
<import plugin-id="logicaldoc-core" />
9494
</requires>

logicaldoc-cmis/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.logicaldoc</groupId>
1010
<artifactId>logicaldoc</artifactId>
11-
<version>9.1.1</version>
11+
<version>9.2</version>
1212
</parent>
1313

1414
<artifactId>logicaldoc-cmis</artifactId>

logicaldoc-cmis/src/main/resources/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<!ELEMENT value (#PCDATA)>
8989
]>
9090

91-
<plugin id="logicaldoc-cmis" version="9.1.1" class="com.logicaldoc.cmis.CmisPlugin">
91+
<plugin id="logicaldoc-cmis" version="9.2" class="com.logicaldoc.cmis.CmisPlugin">
9292
<requires>
9393
<import plugin-id="logicaldoc-core" />
9494
</requires>

logicaldoc-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.logicaldoc</groupId>
88
<artifactId>logicaldoc</artifactId>
9-
<version>9.1.1</version>
9+
<version>9.2</version>
1010
</parent>
1111
<artifactId>logicaldoc-core</artifactId>
1212
<name>logicaldoc-core</name>

logicaldoc-core/src/main/java/com/logicaldoc/core/SystemInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class SystemInfo {
3232

3333
protected String product = "LogicalDOC";
3434

35-
protected String release = "9.1.1";
35+
protected String release = "9.2";
3636

3737
protected String year = "2006-2025";
3838

logicaldoc-core/src/main/java/com/logicaldoc/core/communication/EMailSender.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ public void sendAsync(EMail email, String templateName, Map<String, Object> dict
241241
} catch (Exception e) {
242242
log.error(e.getMessage(), e);
243243
}
244+
return null;
244245
}, THREAD_POOL);
245246
}
246247

@@ -297,6 +298,7 @@ public void sendAsync(EMail email) {
297298
} catch (Exception e) {
298299
log.error(e.getMessage(), e);
299300
}
301+
return null;
300302
}, THREAD_POOL);
301303
}
302304

logicaldoc-core/src/main/java/com/logicaldoc/core/communication/EventCollector.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,15 @@ public void newEvent(History history) {
114114
history.setDocument(clone);
115115
}
116116

117-
Runnable notifier = () -> {
117+
ThreadPools pools = Context.get(ThreadPools.class);
118+
pools.execute(() -> {
118119
log.debug("Notify history {}", history);
119120
for (EventListener listener : listeners) {
120121
listener.newEvent(history);
121122
}
122123
log.debug("Finished notification of history {}", history);
123-
};
124-
125-
ThreadPools pools = Context.get(ThreadPools.class);
126-
pools.execute(notifier, "EventCollector");
124+
return null;
125+
}, "EventCollector");
127126
}
128127

129128
public static boolean isEnabled() {

logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentManagerImpl.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,10 @@ void storeVersionAsync(Version version) {
909909
} catch (InterruptedException ie) {
910910
Thread.currentThread().interrupt();
911911
}
912+
913+
return null;
912914
}, "VersionSave", 100L);
915+
913916
}
914917

915918
private void setAtributesForCreation(File file, Document docVO, DocumentHistory transaction) {

logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentNoteDAO.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ private void updateLastNote(Document document, DocumentNote note) {
7373
} catch (PersistenceException e) {
7474
log.error(e.getMessage(), e);
7575
}
76+
return null;
7677
}, "Note");
7778
}
7879

@@ -118,9 +119,8 @@ public List<DocumentNote> findByDocIdAndTypes(long docId, String fileVersion, Co
118119
params.put(DOC_ID, docId);
119120
params.put("types", types);
120121

121-
return findByWhere(
122-
ENTITY + DOC_ID_DOC_ID_AND + ENTITY + ".type in (:types) and " + ENTITY + DELETED_0, params,
123-
null, null);
122+
return findByWhere(ENTITY + DOC_ID_DOC_ID_AND + ENTITY + ".type in (:types) and " + ENTITY + DELETED_0,
123+
params, null, null);
124124
}
125125
} else if (types == null || types.isEmpty()) {
126126
Map<String, Object> params = new HashMap<>();

0 commit comments

Comments
 (0)