<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">YUKI Hiroshi <shimo****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2015-04-09 16:34:15 +0900 (Thu, 09 Apr 2015)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975">c0a13888ee3b5b66bfc79dc24755f5b4d19db975</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">Don't run callback twice</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#diff-0">lib/droonga-protocol/connection.js</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: lib/droonga-protocol/connection.js (+7 -4)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L229">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L230">230</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L231">231</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L232">232</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L233">233</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L234">234</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L235">235</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L236">236</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L238">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L239">239</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L240">240</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L241">241</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L242">242</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L243">243</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L244">244</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L245">245</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L246">246</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L247">247</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L248">248</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L249">249</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L250">250</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L251">251</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L252">252</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L253">253</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L254">254</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L255">255</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L256">256</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0L257">257</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R229">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R230">230</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R231">231</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R232">232</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R233">233</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R234">234</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R235">235</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R236">236</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R237">237</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R238">238</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R240">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R241">241</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R242">242</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R243">243</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R244">244</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R245">245</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R246">246</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R247">247</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R248">248</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R249">249</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R250">250</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R251">251</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R252">252</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R253">253</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R254">254</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R255">255</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R256">256</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R257">257</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R258">258</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R259">259</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/c0a13888ee3b5b66bfc79dc24755f5b4d19db975#L0R260">260</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -230,7 +230,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">Connection.prototype.emitMessage = function(type, body, callback, options) {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> type: type,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> body: body</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> };</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ var sendingMessages = { type: type };</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (callback) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ sendingMessages.callback = callback;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> envelope.replyTo = from;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> var event = 'reply:' + id;</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -239,19 +241,20 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">Connection.prototype.emitMessage = function(type, body, callback, options) {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> this._logger.debug('Connection.emitMessage.reply %d (%s):',</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> this._id, this.hostAndPort, errorCode);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> clearTimeout(timeoutId);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (sendingMessages)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ sendingMessages.callback = null;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> callback(errorCode, response);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }).bind(this));</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> options.timeout = toPositiveInteger(options.timeout) ||</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DEFAULT_RESPONSE_TIMEOUT;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> timeoutId = setTimeout((function() {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> this.removeAllListeners(event);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (sendingMessages)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ sendingMessages.callback = null;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> callback(ERROR_GATEWAY_TIMEOUT, null);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }).bind(this), options.timeout);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- this._sendingMessages[id] = {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- type: type,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- callback: callback</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- };</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ this._sendingMessages[id] = sendingMessages;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> this._sender.emit('message', envelope, options.emittedCallback);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return envelope;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> };</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>