summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Network.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-03-01 14:00:39 +0100
committerBenoit Foucher <benoit@zeroc.com>2018-03-01 14:00:39 +0100
commit6a53b1575ed0f855108abc5184744c2529c151ae (patch)
tree6e9188775461599b5c83890e226da62e5f255a7f /cpp/src/Ice/Network.cpp
parentFixed JS test suite hang (ICE-8696) (diff)
downloadice-6a53b1575ed0f855108abc5184744c2529c151ae.tar.bz2
ice-6a53b1575ed0f855108abc5184744c2529c151ae.tar.xz
ice-6a53b1575ed0f855108abc5184744c2529c151ae.zip
Fixed UWP transport to cancel read/write operations on close (ICE-8686)
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
-rwxr-xr-xcpp/src/Ice/Network.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index bcfa9e8b54d..9b08d7b9fc7 100755
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -875,6 +875,7 @@ IceInternal::NativeInfo::queueAction(SocketOperation op, IAsyncAction^ action, b
//
this->queueActionCompleted(op, asyncInfo, info, status);
});
+ asyncInfo->operation = action;
}
}
@@ -928,6 +929,7 @@ IceInternal::NativeInfo::queueOperation(SocketOperation op, IAsyncOperation<unsi
});
}
operation->Completed = info->completedHandler;
+ info->operation = operation;
}
}