merge bug20124 into v1_5_1

Matthias Radestock · Matthias Radestock · commit 786ca845390e · 2009-01-15T17:08:16.000Z
diff --git a/src/client/impl/ConnectionBase.cs b/src/client/impl/ConnectionBase.cs
@@ -128,7 +128,7 @@ public ConnectionBase(ConnectionParameters parameters,
 
             m_sessionManager = new SessionManager(this);
             m_session0 = new MainSession(this);
-            m_session0.Handler = new MainSession.SessionCloseDelegate(NotifyReceivedClose);
+            m_session0.Handler = new MainSession.SessionCloseDelegate(NotifyReceivedCloseOk);
             m_model0 = (ModelBase)Protocol.CreateModel(m_session0);
 
             StartMainLoop();
@@ -749,10 +749,10 @@ public void ClosingLoop()
             }
         }
         
-        public void NotifyReceivedClose()
+        public void NotifyReceivedCloseOk()
         {
+            TerminateMainloop();
             closed = true;
-            m_frameHandler.Close();
         }
         
         ///<summary>

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public ConnectionBase(ConnectionParameters parameters,`
`128`	`128`
`129`	`129`	`m_sessionManager = new SessionManager(this);`
`130`	`130`	`m_session0 = new MainSession(this);`
`131`		`- m_session0.Handler = new MainSession.SessionCloseDelegate(NotifyReceivedClose);`
	`131`	`+ m_session0.Handler = new MainSession.SessionCloseDelegate(NotifyReceivedCloseOk);`
`132`	`132`	`m_model0 = (ModelBase)Protocol.CreateModel(m_session0);`
`133`	`133`
`134`	`134`	`StartMainLoop();`
`@@ -749,10 +749,10 @@ public void ClosingLoop()`
`749`	`749`	`}`
`750`	`750`	`}`
`751`	`751`
`752`		`- public void NotifyReceivedClose()`
	`752`	`+ public void NotifyReceivedCloseOk()`
`753`	`753`	`{`
	`754`	`+ TerminateMainloop();`
`754`	`755`	`closed = true;`
`755`		`- m_frameHandler.Close();`
`756`	`756`	`}`
`757`	`757`
`758`	`758`	`///<summary>`