Commit 454b464a authored by Christian Mohrbacher's avatar Christian Mohrbacher

updated to release 6.10

parent a60e513a
......@@ -1025,6 +1025,8 @@ static int __commkit_readfile_recvdata_prefix(CommKitContext* context, ReadfileS
recvRes = __commkit_readfile_receive(context, currentState, dataLenBuf, sizeof(int64_t), true);
if(recvRes < 0)
return recvRes;
if (recvRes == 0)
return -ECOMM;
// got the length info response
Serialization_deserializeInt64(&ctx, &lengthInfo);
......
......@@ -17,9 +17,6 @@ bool CloseChunkFileMsgEx::processIncoming(ResponseContext& ctx)
App* app = Program::getApp();
Config* config = app->getConfig();
SessionStore* sessions = app->getSessions();
Session* session = sessions->referenceSession(getSessionID(), true);
SessionLocalFileStore* sessionLocalFiles = session->getLocalFiles();
SessionLocalFile* sessionLocalFile = NULL;
uint16_t targetID;
bool removeRes;
......@@ -31,6 +28,9 @@ bool CloseChunkFileMsgEx::processIncoming(ResponseContext& ctx)
std::string fileHandleID(getFileHandleID() );
bool isMirrorSession = isMsgHeaderFeatureFlagSet(CLOSECHUNKFILEMSG_FLAG_BUDDYMIRROR);
Session* session;
SessionLocalFileStore* sessionLocalFiles;
SessionLocalFile* sessionLocalFile = NULL;
// select the right targetID
......@@ -64,6 +64,9 @@ bool CloseChunkFileMsgEx::processIncoming(ResponseContext& ctx)
goto send_response;
}
session = sessions->referenceSession(getSessionID(), true);
sessionLocalFiles = session->getLocalFiles();
removeRes = sessionLocalFiles->removeSession(
fileHandleID, targetID, isMirrorSession, &sessionLocalFile);
if(!removeRes)
......
......@@ -37,5 +37,7 @@ void StorageResyncStartedMsgEx::deleteMirrorSessions(uint16_t targetID)
SessionLocalFileStore* sessionLocalFiles = session->getLocalFiles();
sessionLocalFiles->removeAllMirrorSessions(targetID);
sessions->releaseSession(session);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment