summaryrefslogtreecommitdiff
path: root/csharp/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-04-06 10:20:01 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-04-06 10:20:01 +0200
commit99a24b0ca853835c835a77db0003372a22ddaee2 (patch)
tree70abb1ea672bbcd11279d1c767c915c8f824e34b /csharp/src
parentWindows dist testing fix to installDir (diff)
downloadice-99a24b0ca853835c835a77db0003372a22ddaee2.tar.bz2
ice-99a24b0ca853835c835a77db0003372a22ddaee2.tar.xz
ice-99a24b0ca853835c835a77db0003372a22ddaee2.zip
Fixed ICE-7751 - ice_invoke bug, check for null progress reference
Diffstat (limited to 'csharp/src')
-rw-r--r--csharp/src/Ice/Proxy.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/csharp/src/Ice/Proxy.cs b/csharp/src/Ice/Proxy.cs
index fe3c68a12d2..cd304fd4299 100644
--- a/csharp/src/Ice/Proxy.cs
+++ b/csharp/src/Ice/Proxy.cs
@@ -2696,9 +2696,9 @@ namespace Ice
{
SetResult(new Object_Ice_invokeResult(true, null));
}
- if(!alreadySent)
+ if(progress_ != null && !alreadySent)
{
- progress_.Report(sentSynchronously);
+ progress_.Report(sentSynchronously);
}
}