merge bug19389 into default

tonyg · tonyg · commit c0d374e68c63 · 2008-11-07T17:02:50.000Z
diff --git a/src/client/impl/ConnectionBase.cs b/src/client/impl/ConnectionBase.cs
@@ -122,7 +122,7 @@ public ConnectionBase(ConnectionParameters parameters,
 
             m_sessionManager = new SessionManager(this);
             m_session0 = new MainSession(this);
-            m_session0.Handler = NotifyReceivedClose;
+            m_session0.Handler = new MainSession.SessionCloseDelegate(NotifyReceivedClose);
             m_model0 = (ModelBase)Protocol.CreateModel(m_session0);
 
             StartMainLoop();
diff --git a/src/client/impl/MainSession.cs b/src/client/impl/MainSession.cs
@@ -110,7 +110,7 @@ public void SetSessionClosing(bool closeServerInitiated)
         public SessionCloseDelegate Handler
         {
             get { return handler; }
-            set { handler = new SessionCloseDelegate(value); }
+            set { handler = value; }
         }
 
         public override void HandleFrame(Frame frame)

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public void SetSessionClosing(bool closeServerInitiated)`
`110`	`110`	`public SessionCloseDelegate Handler`
`111`	`111`	`{`
`112`	`112`	`get { return handler; }`
`113`		`- set { handler = new SessionCloseDelegate(value); }`
	`113`	`+ set { handler = value; }`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`public override void HandleFrame(Frame frame)`