From d3dc3dd98dba2dd3d4ce6725dc24d3d116c17047 Mon Sep 17 00:00:00 2001
From: Daniele Kruse <dkruse@cern.ch>
Date: Wed, 30 Mar 2016 13:44:41 +0200
Subject: [PATCH] removed unused _old_getNextMount
---
scheduler/Scheduler.cpp | 8 --------
scheduler/Scheduler.hpp | 2 --
.../castor/tape/tapeserver/daemon/DataTransferSession.cpp | 2 +-
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/scheduler/Scheduler.cpp b/scheduler/Scheduler.cpp
index 204840e1ac..5c91366ddb 100644
--- a/scheduler/Scheduler.cpp
+++ b/scheduler/Scheduler.cpp
@@ -269,11 +269,3 @@ std::list<cta::common::dataStructures::DriveState> cta::Scheduler::getDriveState
std::unique_ptr<cta::TapeMount> cta::Scheduler::getNextMount(const std::string &logicalLibraryName, const std::string &driveName) {
return std::unique_ptr<TapeMount>();
}
-
-//------------------------------------------------------------------------------
-// getNextMount
-//------------------------------------------------------------------------------
-std::unique_ptr<cta::TapeMount> cta::Scheduler::_old_getNextMount(const std::string &logicalLibraryName, const std::string & driveName) {
- throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not implemented!");
- return std::unique_ptr<TapeMount>();
-}
diff --git a/scheduler/Scheduler.hpp b/scheduler/Scheduler.hpp
index 550050850a..6c67d030b0 100644
--- a/scheduler/Scheduler.hpp
+++ b/scheduler/Scheduler.hpp
@@ -114,8 +114,6 @@ public:
virtual std::unique_ptr<TapeMount> getNextMount(const std::string &logicalLibraryName, const std::string &driveName);
- virtual std::unique_ptr<TapeMount> _old_getNextMount(const std::string &logicalLibraryName, const std::string & driveName);
-
virtual void authorizeCliIdentity(const cta::common::dataStructures::SecurityIdentity &cliIdentity);
private:
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp
index c77bc18ae4..7fed885a0c 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp
@@ -87,7 +87,7 @@ castor::tape::tapeserver::daemon::Session::EndOfSessionAction
// 2a) Get initial information from the client
std::unique_ptr<cta::TapeMount> tapeMount;
try {
- tapeMount.reset(m_scheduler._old_getNextMount(m_driveConfig.getLogicalLibrary(), m_driveConfig.getUnitName()).release());
+ tapeMount.reset(m_scheduler.getNextMount(m_driveConfig.getLogicalLibrary(), m_driveConfig.getUnitName()).release());
} catch (cta::exception::Exception & e) {
log::ScopedParamContainer localParams(lc);
localParams.add("errorMessage", e.getMessageValue());
--
GitLab