Skip to content
This repository has been archived by the owner on Mar 27, 2024. It is now read-only.

Commit

Permalink
The JobLauncher now checks if *all* Entries on the Form's "Input Files"
Browse files Browse the repository at this point in the history
DataComponent have valid values (not just the first one). If an Entry
has an invalid value, it throws FormStatus.InfoError, prints a message,
and halts the launching process. Fixes bug 451052.

Signed-off-by: Anna Wojtowicz <wojtowicza@ornl.gov>
  • Loading branch information
Anna Wojtowicz committed Apr 20, 2015
1 parent 2839080 commit 76517d4
Showing 1 changed file with 10 additions and 2 deletions.
Expand Up @@ -637,12 +637,20 @@ private FormStatus fillActionDataMap() {
// Check the components and fail if they are null
if (fileData == null) {
return FormStatus.InfoError;
} else {
// Make sure if there are any additional input files, that they are
// all valid too
for (Entry entry : fileData.retrieveAllEntries()) {
if (entry.getValue() == null || entry.getValue().isEmpty()) {
System.out.println("JobLauncher Error: All input file "
+ "entries must be set!");
return FormStatus.InfoError;
}
}
}
// Allocate the map
actionDataMap = new Hashtable<String, String>();

// Get the input file's name
fileData = (DataComponent) form.getComponent(1);
// Write the file name for debug info
for (String entryName : inputFileNameMap.keySet()) {
fileEntry = fileData.retrieveEntry(entryName);
Expand Down

0 comments on commit 76517d4

Please sign in to comment.