From 26e6ec6ae8a0233c70e0dd0df6b707bcb150bca5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Tue, 11 Feb 2020 09:21:22 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31736 --- .../META-INF/MANIFEST.MF | 1 + .../src/user/commons/StoreUri.java | 4 ++-- .../commons/remotestore/TSMInputStream.java | 22 +++++++++---------- .../user/commons/remotestore/TSMLister.java | 4 ++-- .../resources/i3-label_hu.properties | 2 +- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF index b136357d..02d7d034 100644 --- 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 db4eb635..b6c34e44 100644 --- 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 67208aa2..1ea413dd 100644 --- 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; +import java.io.IOException; import java.io.InputStream; import org.apache.logging.log4j.LogManager; @@ -11,12 +12,12 @@ import user.tsm.client.TSMBufferedClient; import user.tsm.client.TSMException; public class TSMInputStream extends InputStream { + private static final Logger logger = LogManager.getLogger(); private TSMBufferedClient client; private TSMBackupFileObject backupObject; private String filespaceName; private String highLevelName; private RemoteFile remoteFile; - private static final Logger logger = LogManager.getLogger(); private boolean initialized; @@ -27,9 +28,15 @@ public class TSMInputStream extends InputStream { this.remoteFile = remoteFile; } + @Override + public void close() { + client.disconnect(); + logger.info("TSM lekapcsol�dott!"); + } + public void open() throws TSMException { backupObject = client.getActiveBackupFileObject(filespaceName, highLevelName, remoteFile.getName()); - logger.info("TSMInputStream backupObject l�trej�tt!"); + logger.info("BackupObject created"); } @Override @@ -38,7 +45,7 @@ public class TSMInputStream extends InputStream { } @Override - public int read(byte[] buffer, int off, int len) { + public int read(byte[] buffer, int off, int len) throws IOException { int result = 0; if (client != null) { if (!initialized) { @@ -48,16 +55,9 @@ public class TSMInputStream extends InputStream { try { result = client.recievePartial(buffer, backupObject, null); } catch (Exception e) { - e.printStackTrace(); - logger.info("TSMInputStream olvas�si hiba!", e); + throw new IOException("TSMInputStream read error. " + e.getMessage(), e); } } return result; } - - @Override - public void close() { - client.disconnect(); - logger.info("TSM lekapcsol�dott!"); - } } 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 fca30aa1..82eecdf7 100644 --- 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"); if (backupFileObject != null) { result = toRemoteFile(backupFileObject); - logger.info("TSMLister backupFileObject-et elk�rte a k�vetkez� n�vvel: " + backupFileObject.getLowLevelName()); + logger.info("BackupFileObject: " + backupFileObject.getLowLevelName()); } else cleanUp(); return result; @@ -74,7 +74,7 @@ public class TSMLister implements IDirectoryLister { @Override public InputStream getInputStream(RemoteFile remoteFile) throws Exception { TSMInputStream inputStream = new TSMInputStream(client, FSNAME, HLNAME, remoteFile); - logger.info("TSM InputStream l�trej�tt!"); + logger.info("TSM InputStream created"); inputStream.open(); return inputStream; } 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 b700857e..6e6e9988 100644 --- 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 +version=2.4.7 footer=2016-2019 © Copyright User Rendszerház Kft. login_info=Információ -- 2.54.0