| Index: remoting/webapp/crd/js/session_connector_impl.js
|
| diff --git a/remoting/webapp/crd/js/session_connector_impl.js b/remoting/webapp/crd/js/session_connector_impl.js
|
| index 13def395a28b4a4cc4633f4fe91f07671d0d7d90..971ac40f4055d9d7cfdc6c81eceda3fed0f5e75f 100644
|
| --- a/remoting/webapp/crd/js/session_connector_impl.js
|
| +++ b/remoting/webapp/crd/js/session_connector_impl.js
|
| @@ -86,7 +86,7 @@ remoting.SessionConnectorImpl = function(clientContainer, onConnected, onError,
|
| * @private
|
| */
|
| remoting.SessionConnectorImpl.prototype.resetConnection_ = function() {
|
| - this.removePlugin_();
|
| + this.closeSession();
|
|
|
| /** @private {remoting.Host} */
|
| this.host_ = null;
|
| @@ -323,7 +323,7 @@ remoting.SessionConnectorImpl.prototype.createSession_ = function() {
|
| // In some circumstances, the WCS <iframe> can get reloaded, which results
|
| // in a new clientJid and a new callback. In this case, remove the old
|
| // client plugin before instantiating a new one.
|
| - this.removePlugin_();
|
| + this.closeSession();
|
|
|
| var pluginContainer = this.clientContainer_.querySelector(
|
| '.client-plugin-container');
|
| @@ -382,14 +382,11 @@ remoting.SessionConnectorImpl.prototype.onPluginInitialized_ = function(
|
| remoting.SessionConnectorImpl.prototype.pluginError_ = function(error) {
|
| this.signalStrategy_.setIncomingStanzaCallback(null);
|
| this.clientSession_.disconnect(error);
|
| - this.removePlugin_();
|
| + this.closeSession();
|
| };
|
|
|
| -/** @private */
|
| -remoting.SessionConnectorImpl.prototype.removePlugin_ = function() {
|
| - if (this.clientSession_) {
|
| - this.clientSession_.removePlugin();
|
| - }
|
| +remoting.SessionConnectorImpl.prototype.closeSession = function() {
|
| + base.dispose(this.clientSession_);
|
| this.clientSession_ = null;
|
| remoting.clientSession = null;
|
|
|
|
|