git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF
index b136357dd500de47880db016017b45b24071bc38..02d7d03488ab9ea8002369918cc801357e09b397 100644 (file)
--- a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF
+++ b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5",
  com.fasterxml.jackson.datatype.joda;version="2.4.5",
  com.fasterxml.jackson.jaxrs.json;version="2.4.5",
  io.humble.video,
+ io.humble.video.awt,
  org.apache.logging.log4j;version="2.8.2",
  org.apache.logging.log4j.message;version="2.8.2",
  org.jboss.resteasy.client.jaxrs,

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/StoreUri.java b/server/user.jobengine.osgi.commons/src/user/commons/StoreUri.java
index db4eb6355a97a47ab0ed0cdfd6ae4aa15cb8c466..b6c34e44ed79cef0656a54900d45875e513dfef8 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/StoreUri.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/StoreUri.java
@@ -83,7 +83,7 @@ public class StoreUri extends EntityBase implements Serializable {
 
                InputStream inputStream = inputLister.getInputStream(source);
                if (inputStream == null)
-                       throw new Exception("InputStream is null!");
+                       throw new Exception("InputStream is null");
 
                result = new RemoteFile();
                String targetFileName = targetName;
@@ -115,7 +115,7 @@ public class StoreUri extends EntityBase implements Serializable {
                                if (out == null) {
                                        outputStream = outputLister.getOutputStream(result);
                                        if (outputStream == null)
-                                               throw new Exception("OutputStream is null!");
+                                               throw new Exception("OutputStream is null");
                                        out = new BufferedOutputStream(outputStream, BUFFER_SIZE);
                                }
 

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMInputStream.java b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMInputStream.java
index 67208aa2bd83646166d03201be396ff8ba1dd105..1ea413ddd18939d0af36fec549a275e8cab5f658 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMInputStream.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMInputStream.java
@@ -1,5 +1,6 @@
 package user.commons.remotestore;\r
 \r
+import java.io.IOException;\r
 import java.io.InputStream;\r
 \r
 import org.apache.logging.log4j.LogManager;\r
@@ -11,12 +12,12 @@ import user.tsm.client.TSMBufferedClient;
 import user.tsm.client.TSMException;\r
 \r
 public class TSMInputStream extends InputStream {\r
+       private static final Logger logger = LogManager.getLogger();\r
        private TSMBufferedClient client;\r
        private TSMBackupFileObject backupObject;\r
        private String filespaceName;\r
        private String highLevelName;\r
        private RemoteFile remoteFile;\r
-       private static final Logger logger = LogManager.getLogger();\r
 \r
        private boolean initialized;\r
 \r
@@ -27,9 +28,15 @@ public class TSMInputStream extends InputStream {
                this.remoteFile = remoteFile;\r
        }\r
 \r
+       @Override\r
+       public void close() {\r
+               client.disconnect();\r
+               logger.info("TSM lekapcsol�dott!");\r
+       }\r
+\r
        public void open() throws TSMException {\r
                backupObject = client.getActiveBackupFileObject(filespaceName, highLevelName, remoteFile.getName());\r
-               logger.info("TSMInputStream backupObject l�trej�tt!");\r
+               logger.info("BackupObject created");\r
        }\r
 \r
        @Override\r
@@ -38,7 +45,7 @@ public class TSMInputStream extends InputStream {
        }\r
 \r
        @Override\r
-       public int read(byte[] buffer, int off, int len) {\r
+       public int read(byte[] buffer, int off, int len) throws IOException {\r
                int result = 0;\r
                if (client != null) {\r
                        if (!initialized) {\r
@@ -48,16 +55,9 @@ public class TSMInputStream extends InputStream {
                        try {\r
                                result = client.recievePartial(buffer, backupObject, null);\r
                        } catch (Exception e) {\r
-                               e.printStackTrace();\r
-                               logger.info("TSMInputStream olvas�si hiba!", e);\r
+                               throw new IOException("TSMInputStream read error. " + e.getMessage(), e);\r
                        }\r
                }\r
                return result;\r
        }\r
-\r
-       @Override\r
-       public void close() {\r
-               client.disconnect();\r
-               logger.info("TSM lekapcsol�dott!");\r
-       }\r
 }\r

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java
index fca30aa19abfaf12c170694e3b11450619143d8e..82eecdf748ca16a31e4d890875a6e3cd31817db0 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java
@@ -65,7 +65,7 @@ public class TSMLister implements IDirectoryLister {
                logger.info("TSMLister get");\r
                if (backupFileObject != null) {\r
                        result = toRemoteFile(backupFileObject);\r
-                       logger.info("TSMLister backupFileObject-et elk�rte a k�vetkez� n�vvel: " + backupFileObject.getLowLevelName());\r
+                       logger.info("BackupFileObject: " + backupFileObject.getLowLevelName());\r
                } else\r
                        cleanUp();\r
                return result;\r
@@ -74,7 +74,7 @@ public class TSMLister implements IDirectoryLister {
        @Override\r
        public InputStream getInputStream(RemoteFile remoteFile) throws Exception {\r
                TSMInputStream inputStream = new TSMInputStream(client, FSNAME, HLNAME, remoteFile);\r
-               logger.info("TSM InputStream l�trej�tt!");\r
+               logger.info("TSM InputStream created");\r
                inputStream.open();\r
                return inputStream;\r
        }\r

diff --git a/server/user.jobengine.osgi.server/resources/i3-label_hu.properties b/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
index b700857ed7ab557805dfc1e67c67c9f4b2b23bc1..6e6e9988ac6940e3856d1b88879873e2b0fac82d 100644 (file)
--- a/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
+++ b/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
@@ -1,4 +1,4 @@
-version=2.4.6\r
+version=2.4.7\r
 footer=2016-2019 © Copyright User Rendszerház Kft.\r
 \r
 login_info=Információ\r