From 28f9cf36bdab5c8d7bf73787b5880748ac220e4d Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Mon, 30 Jul 2012 09:41:20 +0000
Subject: [PATCH] BIS-38 SP-204 : Improved message in case of node existence
difference.
SVN: 26278
---
.../DataSetAndPathInfoDBConsistencyCheckProcessingPlugin.java | 4 ++--
...aSetAndPathInfoDBConsistencyCheckProcessingPluginTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPlugin.java
index a184257cf29..0a0bb09647f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPlugin.java
@@ -392,11 +392,11 @@ public class DataSetAndPathInfoDBConsistencyCheckProcessingPlugin implements IPr
if (existsInFS)
{
return "'" + getPath()
- + "' exists in the file system but doesn't exist in the path info database";
+ + "' exists on the file system but doesn't exist in the path info database";
} else
{
return "'" + getPath()
- + "' exists in the path info database but doesn't exist in the file system";
+ + "' exists in the path info database but doesn't exist on the file system";
}
}
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest.java
index d467774e272..257b34078ce 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest.java
@@ -243,7 +243,7 @@ public class DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest extends
+ "Differences found:\n\n"
+ "Data set ds-1:\n"
+ "- 'targets/unit-test-wd/ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest' "
- + "exists in the path info database but doesn't exist in the file system\n\n";
+ + "exists in the path info database but doesn't exist on the file system\n\n";
} else
{
--
GitLab