[openmeetings] branch master updated: [OPENMEETINGS-1856] code simplification

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 36cec36  [OPENMEETINGS-1856] code simplification
36cec36 is described below

commit 36cec3605ef6ed0d02c36a4380e58801ff3e8a86
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat Nov 3 11:48:39 2018 +0700

    [OPENMEETINGS-1856] code simplification
---
 .../apache/openmeetings/db/entity/file/FileItemLog.java  | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItemLog.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItemLog.java
index cf2b3e6..3e3c9c1 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItemLog.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItemLog.java
@@ -18,10 +18,8 @@
  */
 package org.apache.openmeetings.db.entity.file;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.openmeetings.util.process.ProcessResult.ZERO;
 
-import java.util.Arrays;
 import java.util.Date;
 
 import javax.persistence.Column;
@@ -61,7 +59,7 @@ public class FileItemLog implements IDataProviderEntity {
 
        @Lob
        @Column(name = "message", length = MAX_LOG_SIZE)
-       private byte[] bytes;
+       private String message;
 
        @Column(name = "exit_code")
        private Integer exitCode;
@@ -107,11 +105,11 @@ public class FileItemLog implements IDataProviderEntity {
        }
 
        public String getMessage() {
-               return bytes == null ? null : new String(bytes, UTF_8);
+               return message;
        }
 
        public FileItemLog setMessage(String message) {
-               setBytes(message.getBytes(UTF_8));
+               this.message = message == null || message.length() < 
MAX_LOG_SIZE ? message : message.substring(0, MAX_LOG_SIZE);
                return this;
        }
 
@@ -124,14 +122,6 @@ public class FileItemLog implements IDataProviderEntity {
                return this;
        }
 
-       public byte[] getBytes() {
-               return bytes;
-       }
-
-       public void setBytes(byte[] a) {
-               this.bytes = a == null || a.length < MAX_LOG_SIZE ? a : 
Arrays.copyOf(a, MAX_LOG_SIZE);
-       }
-
        public boolean isOk() {
                return optional || !isWarn();
        }