Skip to content

Commit

Permalink
Merge branch 'master' into wrench-fsmod
Browse files Browse the repository at this point in the history
  • Loading branch information
henricasanova committed Jul 9, 2024
2 parents 563eb79 + 0d8ae61 commit f54a63b
Show file tree
Hide file tree
Showing 6 changed files with 3,565 additions and 176 deletions.
4 changes: 2 additions & 2 deletions src/wrench/job/CompoundJob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ namespace wrench {
}

/**
* @brief Add a file registry add entry action
* @brief Add a file registry delete entry action
* @param name: the action's name
* @param file_registry: the file registry
* @param file_location: the file location
Expand Down Expand Up @@ -408,7 +408,7 @@ namespace wrench {
throw std::invalid_argument("CompoundJob::addDependency(): Cannot add a dependency between a task and itself");
}
if (parent->getJob() != this->getSharedPtr() or child->getJob() != this->getSharedPtr()) {
throw std::invalid_argument("CompoundJob::addDependency(): Both actions must belong to this job");
throw std::invalid_argument("CompoundJob::addDependency(): Both actions muszt belong to this job");
}
if (pathExists(child, parent)) {
throw std::invalid_argument("CompoundJob::addDependency(): Adding this dependency would create a cycle");
Expand Down
1 change: 0 additions & 1 deletion src/wrench/services/file_registry/FileRegistryService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ namespace wrench {
if (location == nullptr) {
throw std::invalid_argument("FileRegistryService::addEntry(): Invalid nullptr argument");
}

assertServiceIsUp();

auto answer_commport = S4U_Daemon::getRunningActorRecvCommPort();
Expand Down
Loading

0 comments on commit f54a63b

Please sign in to comment.