From f4f0d578667161eb6dc7821d8f6b00228bc62981 Mon Sep 17 00:00:00 2001
From: Andreas Romeyke <andreas.romeyke@slub-dresden.de>
Date: Thu, 26 Jan 2023 15:57:39 +0100
Subject: [PATCH] - fixed log output
---
.../repository/plugin/storage/nfs/SLUBStoragePlugin.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java b/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java
index a20604e..092ba39 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java
@@ -266,14 +266,13 @@ public class SLUBStoragePlugin extends AbstractStorageHandler {
//log.debug("SLUBStoragePlugin.checkFixityByPlugin() another fixity, root=" + getDirRoot() + " absolute_storedEntityIdentifier=" + absolute_storedEntityIdentifier);
contractAssertIsAbsolutePath(absolute_storedEntityIdentifier);
String pluginname = fixity.getPluginName();
- String algorithm = "should not occur";
//log.debug("SLUBStoragePlugin.checkFixityByPlugin() pluginname=" + pluginname);
// HINT: Workaround for Rosetta case 06472860 - Storage Plugin: Empty custom fixity plugin name breaks file updates [Rosetta 7.3.0.0]
// -> use fallback names in case fixity plugin name is missing
if (pluginname == null || pluginname.length() == 0) {
log.warn("SLUBStoragePlugin.checkFixityByPlugin() failed to get pluginname, because it is empty. Possibly, there is no valid fixity type used or a CustomFixityPlugin missed");
log.warn("SLUBStoragePlugin.checkFixityByPlugin() trying to use fallback table to determine plugin name");
- algorithm = fixity.getAlgorithm();
+ String algorithm = fixity.getAlgorithm();
if ("SHA512".equals(algorithm)) {
pluginname = "CustomFixitySHA512Plugin";
//log.debug("SLUBStoragePlugin.checkFixityByPlugin() pluginname=" + pluginname);
@@ -298,7 +297,7 @@ public class SLUBStoragePlugin extends AbstractStorageHandler {
boolean result = fixity.getResult();
long endtime = System.currentTimeMillis();
log.info("SLUBStoragePlugin.checkFixityByPlugin() pathname='" + absolute_storedEntityIdentifier + "'"
- + " algorithm=" + algorithm
+ + " plugin=" + pluginname
+ " oldvalue=" + oldValue
+ " newvalue=" + newValue
+ " result=" + result
@@ -521,7 +520,7 @@ public class SLUBStoragePlugin extends AbstractStorageHandler {
//log.debug("SLUBStoragePlugin.copyStream() pid='" + pid + "'");
String iePid = storedEntityMetadata.getIePid();
//log.debug("SLUBStoragePlugin.copyStream() iePid='" + iePid + "'");
- String attr = "('\"+srcPath+\"','\" + destPath + \"')";
+ String attr = "('"+srcPath+"','" + destPath + "')";
if ("copy".equalsIgnoreCase(filesHandlingMethod)) {
// FileUtil.copyFile(srcPath, destPath);
copyFile(srcPath, destPath);
--
GitLab