it->second.erase(key);

		}

		if (it->second.empty()) {

			toRemove.push_back(it->first);

		}

	}

	BOOST_FOREACH(std::string &key, toRemove) {

		m_sessions.erase(key);

	}

	if (removedCommands > 0) {

		LOG4CXX_INFO(logger, "Removed " << removedCommands << " old commands sessions.");

	}

}

bool AdHocManager::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::Command> payload) {

	return false;

}

bool AdHocManager::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::Command> payload) {

	AdHocCommand *command = NULL;

	// Try to find AdHocCommand according to 'from' and session_id

		if (m_sessions[from].find(payload->getSessionID()) != m_sessions[from].end()) {

			command = m_sessions[from][payload->getSessionID()];

		}

		else {

			LOG4CXX_ERROR(logger, from.toString() << ": Unknown session id " << payload->getSessionID() << " - ignoring");

			sendError(from, id, Swift::ErrorPayload::BadRequest, Swift::ErrorPayload::Modify);

			return true;

		}

	}

	// Check if we can create command with this node

	else if (m_factories.find(payload->getNode()) != m_factories.end()) {

		command = m_factories[payload->getNode()]->createAdHocCommand(m_component, m_userManager, m_storageBackend, from, to);

		m_sessions[from][command->getId()] = command;

		LOG4CXX_INFO(logger, from.toString() << ": Started new AdHoc command session with node " << payload->getNode());

	}

	else {

		LOG4CXX_INFO(logger, from.toString() << ": Unknown node " << payload->getNode() << ". Can't start AdHoc command session.");

		sendError(from, id, Swift::ErrorPayload::BadRequest, Swift::ErrorPayload::Modify);

		return true;

	}

	if (!command) {

		LOG4CXX_ERROR(logger, from.toString() << ": createAdHocCommand for node " << payload->getNode() << " returned NULL pointer");

		sendError(from, id, Swift::ErrorPayload::BadRequest, Swift::ErrorPayload::Modify);