From d83b748aae7416b0ce7f584f75291ceef8df0e90 Mon Sep 17 00:00:00 2001
From: kohleman <kohleman>
Date: Fri, 13 May 2011 07:55:33 +0000
Subject: [PATCH] bugfix: handle error when no file matches regexp
SVN: 21261
---
.../plugins/FileBasedImageAnalysisGraphReportingPlugin.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
index a667eb42b8d..6b1de00c4db 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
@@ -85,11 +85,11 @@ public class FileBasedImageAnalysisGraphReportingPlugin extends AbstractDataMerg
{
final File dir = getDataSubDir(context.getDirectoryProvider(), dataset);
List<File> matchingFiles = findMatchingFiles(dataset, dir);
- if (matchingFiles.size() > 1)
+ if (matchingFiles.size() != 1)
{
throw UserFailureException.fromTemplate(
- "Found multiple candidate files in the dataset %s ",
- dataset.getDataSetCode());
+ "Expected exactly one matching file in the dataset %s but found %d", dataset
+ .getDataSetCode(), matchingFiles.size());
}
builder.addRow(createRow(dataset, matchingFiles.get(0)));
}
--
GitLab