2009-08-20 Atsushi Enomoto <[email protected]>

	* TcpDuplexSessionChannel.cs : in callback client channels,
	  OperationContext.IncomingMessageHeaders is null.


svn path=/trunk/mcs/; revision=140320

mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog

@@ -1,3 +1,8 @@
+2009-08-20  Atsushi Enomoto  <[email protected]>
+
+	* TcpDuplexSessionChannel.cs : in callback client channels,
+	  OperationContext.IncomingMessageHeaders is null.
+
 2009-08-20  Atsushi Enomoto  <[email protected]>
 
 	* MessageHeaders.cs : duplicate check was sloppy.

mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpDuplexSessionChannel.cs

@@ -144,7 +144,7 @@ namespace System.ServiceModel.Channels
 				if (message.Headers.ReplyTo == null)
 					message.Headers.ReplyTo = new EndpointAddress (Constants.WsaAnonymousUri);
 			} else {
-				if (message.Headers.RelatesTo == null)
+				if (message.Headers.RelatesTo == null && OperationContext.Current.IncomingMessageHeaders != null)
 					message.Headers.RelatesTo = OperationContext.Current.IncomingMessageHeaders.MessageId;
 			}