History

revert changes

ZappoMan committed 12 years ago

Commit 450a9c01 parent 499c4bd1 file · +5 −8Browse files

Showing the changes to assignment-client/src/AssignmentClient.cpp (1 of 1 file). Show all

Unified · Split

assignment-client/src/AssignmentClient.cpp+5−8
@@ -194,8 +194,6 @@ void AssignmentClient::handleAuthenticationRequest() { · 193 unmodified lines
194}194}
195 195
196void AssignmentClient::assignmentCompleted() {196void AssignmentClient::assignmentCompleted() {
197qDebug() << "START AssignmentClient::assignmentCompleted()... this=" << this << "_currentAssignment=" << _currentAssignment;
198
199 // reset the logging target to the the CHILD_TARGET_NAME197 // reset the logging target to the the CHILD_TARGET_NAME
200 Logging::setTargetName(ASSIGNMENT_CLIENT_TARGET_NAME);198 Logging::setTargetName(ASSIGNMENT_CLIENT_TARGET_NAME);
201 199
@@ -203,15 +201,14 @@ qDebug() << "START AssignmentClient::assignmentCompleted()... this=" << this << · 1 unmodified line
203 201
204 NodeList* nodeList = NodeList::getInstance();202 NodeList* nodeList = NodeList::getInstance();
205 203
206 // reset our NodeList by switching back to unassigned and clearing the list
207 nodeList->reset();
208 nodeList->setOwnerType(NodeType::Unassigned);
209 nodeList->resetNodeInterestSet();
210
211 // have us handle incoming NodeList datagrams again204 // have us handle incoming NodeList datagrams again
212 disconnect(&nodeList->getNodeSocket(), 0, _currentAssignment, 0);205 disconnect(&nodeList->getNodeSocket(), 0, _currentAssignment, 0);
213 connect(&nodeList->getNodeSocket(), &QUdpSocket::readyRead, this, &AssignmentClient::readPendingDatagrams);206 connect(&nodeList->getNodeSocket(), &QUdpSocket::readyRead, this, &AssignmentClient::readPendingDatagrams);
214 207
215qDebug() << "DONE AssignmentClient::assignmentCompleted()... this=" << this << "_currentAssignment was=" << _currentAssignment;
216 _currentAssignment = NULL;208 _currentAssignment = NULL;
209
210 // reset our NodeList by switching back to unassigned and clearing the list
211 nodeList->setOwnerType(NodeType::Unassigned);
212 nodeList->reset();
213 nodeList->resetNodeInterestSet();
217}214}