summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qpid/dotnet/client-010/client/client/Message.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/qpid/dotnet/client-010/client/client/Message.cs b/qpid/dotnet/client-010/client/client/Message.cs
index 3e18b4d7b7..567ca5cae7 100644
--- a/qpid/dotnet/client-010/client/client/Message.cs
+++ b/qpid/dotnet/client-010/client/client/Message.cs
@@ -44,7 +44,7 @@ namespace org.apache.qpid.client
{
get
{
- if (_message.Header != null)
+ if (_message.Header != null && Header.Structs.Length > 1)
return (MessageProperties) Header.Structs[0];
return null;
}
@@ -62,7 +62,12 @@ namespace org.apache.qpid.client
get
{
if (Header != null)
- return (DeliveryProperties) Header.Structs[1];
+ {
+ if( Header.Structs.Length > 1 )
+ return (DeliveryProperties)Header.Structs[1];
+ return (DeliveryProperties)Header.Structs[0];
+ }
+
return null;
}
set