code fixes

Author: car031

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

@@ -3,8 +3,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -2009,8 +2007,7 @@ public DocumentFuture merge(Collection<Document> documents, long targetFolderId,
 	 * @throws IOException
 	 */
 	private File preparePdfs(User user, List<Long> docIds) throws IOException {
-		Path tempPath = Files.createTempDirectory(MERGE);
-		File tempDir = tempPath.toFile();
+		File tempDir = FileUtil.createTempDirectory(MERGE);
 
 		DecimalFormat nf = new DecimalFormat("00000000");
 		int i = 0;

logicaldoc-core/src/main/java/com/logicaldoc/core/imaging/ImageZone.java

@@ -1,5 +1,7 @@
 package com.logicaldoc.core.imaging;
 
+import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 
@@ -10,7 +12,9 @@
  * @since 8.4.2
  */
 @MappedSuperclass
-public class ImageZone {
+public class ImageZone implements Serializable {
+
+	private static final long serialVersionUID = 1L;
 
 	/**
 	 * Upper-left corner of the zone (percentage of the width 0..1)

logicaldoc-webapp/src/main/java/com/logicaldoc/web/websockets/EventEndpoint.java

@@ -182,15 +182,7 @@ private WebsocketMessage prepareMessage(History event) throws PersistenceExcepti
 			message.setFolderId(adh.getFolderId());
 			message.setDocId(adh.getDocId());
 
-			GUIFolder folder = null;
-			if (adh.getFolder() != null) {
-				String color = adh.getFolder().getColor();
-				folder = new FolderServiceImpl().fromFolder(adh.getFolder(), true);
-				folder.setColor(color);
-			} else if (adh.getFolderId() != null)
-				folder = new FolderServiceImpl().getFolder(null, adh.getFolderId(), true);
-			if (folder != null)
-				message.setFolder(folder);
+			GUIFolder folder = setFolder(message, adh);
 
 			GUIDocument document = null;
 			if (adh.getDocument() != null && adh.getDocument() instanceof Document doc) {
@@ -228,6 +220,20 @@ private WebsocketMessage prepareMessage(History event) throws PersistenceExcepti
 		return message;
 	}
 
+	protected GUIFolder setFolder(WebsocketMessage message, AbstractDocumentHistory adh)
+			throws PersistenceException, ServerException {
+		GUIFolder folder = null;
+		if (adh.getFolder() != null) {
+			String color = adh.getFolder().getColor();
+			folder = new FolderServiceImpl().fromFolder(adh.getFolder(), true);
+			folder.setColor(color);
+		} else if (adh.getFolderId() != null)
+			folder = new FolderServiceImpl().getFolder(null, adh.getFolderId(), true);
+		if (folder != null)
+			message.setFolder(folder);
+		return folder;
+	}
+
 	@OnError
 	public void error(Session session, Throwable t) {
 		log.warn(t.getMessage());