Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 13:49:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

immediately error in AssetClient if no active socket for AS

Browse source
This commit is contained in:
Stephen Birarda 2016-10-12 14:29:05 -07:00
parent ca94fbc219
commit 3c70a25a40
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/networking/src/AssetClient.cpp
View file

@ -453,15 +453,17 @@ MessageID AssetClient::getAssetMapping(const AssetPath& path, MappingOperationCa
packetList->writeString(path); packetList->writeString(path);
nodeList->sendPacketList(std::move(packetList), *assetServer); if (nodeList->sendPacketList(std::move(packetList), *assetServer)) {
_pendingMappingRequests[assetServer][messageID] = callback;
_pendingMappingRequests[assetServer][messageID] = callback; return messageID;
} else {
return messageID; qDebug() << "getAssetMapping would have been sent but no active socket - send back no response received";
} else { }
callback(false, AssetServerError::NoError, QSharedPointer<ReceivedMessage>());
return INVALID_MESSAGE_ID;
} }
callback(false, AssetServerError::NoError, QSharedPointer<ReceivedMessage>());
return INVALID_MESSAGE_ID;
} }
MessageID AssetClient::getAllAssetMappings(MappingOperationCallback callback) { MessageID AssetClient::getAllAssetMappings(MappingOperationCallback callback) {

2
libraries/networking/src/MappingRequest.cpp
View file

@ -65,6 +65,8 @@ void GetMappingRequest::doStart() {
auto assetClient = DependencyManager::get<AssetClient>(); auto assetClient = DependencyManager::get<AssetClient>();
qDebug() << "Asking asset client to get mapping for" << _path;
_mappingRequestID = assetClient->getAssetMapping(_path, _mappingRequestID = assetClient->getAssetMapping(_path,
[this, assetClient](bool responseReceived, AssetServerError error, QSharedPointer<ReceivedMessage> message) { [this, assetClient](bool responseReceived, AssetServerError error, QSharedPointer<ReceivedMessage> message) {