##// END OF EJS Templates
Address @takluyver 's comments
Jonathan Frederic -
Show More
@@ -51,7 +51,7 b' define(['
51
51
52 CommManager.prototype.register_comm = function (comm) {
52 CommManager.prototype.register_comm = function (comm) {
53 // Register a comm in the mapping
53 // Register a comm in the mapping
54 this.comms[comm.comm_id] = new Promise(function(resolve) {resolve(comm);});
54 this.comms[comm.comm_id] = Promise.resolve(comm);
55 comm.kernel = this.kernel;
55 comm.kernel = this.kernel;
56 return comm.comm_id;
56 return comm.comm_id;
57 };
57 };
@@ -74,7 +74,10 b' define(['
74 var comm = new Comm(content.target_name, comm_id);
74 var comm = new Comm(content.target_name, comm_id);
75 comm.kernel = that.kernel;
75 comm.kernel = that.kernel;
76 try {
76 try {
77 target(comm, msg);
77 var response = target(comm, msg);
78 if (response instanceof Promise) {
79 return response.then(function() { Promise.resolve(comm); });
80 }
78 } catch (e) {
81 } catch (e) {
79 comm.close();
82 comm.close();
80 that.unregister_comm(comm);
83 that.unregister_comm(comm);
@@ -82,7 +85,7 b' define(['
82 console.error(wrapped_error);
85 console.error(wrapped_error);
83 return Promise.reject(wrapped_error);
86 return Promise.reject(wrapped_error);
84 }
87 }
85 return comm;
88 return Promise.resolve(comm);
86 }, utils.reject('Could not open comm', true));
89 }, utils.reject('Could not open comm', true));
87 return this.comms[comm_id];
90 return this.comms[comm_id];
88 };
91 };
General Comments 0
You need to be logged in to leave comments. Login now