112412 2013-03-14 23:48:47 -0700 Web Inspector: [Network] Refine JSDocs in NetworkRequest.js 2013-03-15 11:49:37 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 eustas eustas apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 855740 0 eustas 2013-03-14 23:48:47 -0700 Return types for some members are confusing (Object). 855751 1 193244 eustas 2013-03-15 00:05:17 -0700 Created attachment 193244 Patch 855792 2 193244 vsevik 2013-03-15 01:12:59 -0700 Comment on attachment 193244 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193244&action=review > Source/WebCore/inspector/front-end/NetworkRequest.js:79 > +/** @typedef {!NetworkAgent.WebSocketFrame|{errorMessage: string, time: number}} */ This is not a valid type, we don't use | other than for undefined. 855840 3 193268 eustas 2013-03-15 03:05:39 -0700 Created attachment 193268 Patch 855841 4 193244 eustas 2013-03-15 03:07:11 -0700 Comment on attachment 193244 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193244&action=review >> Source/WebCore/inspector/front-end/NetworkRequest.js:79 >> +/** @typedef {!NetworkAgent.WebSocketFrame|{errorMessage: string, time: number}} */ > > This is not a valid type, we don't use | other than for undefined. Fixed. Thanks. 855877 5 193268 mkwst 2013-03-15 04:09:34 -0700 Comment on attachment 193268 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193268&action=review > Source/WebCore/inspector/front-end/NetworkRequest.js:615 > + this._sortedResponseHeaders.sort(function(a, b) { return a.name.toLowerCase().compareTo(b.name.toLowerCase()) }); Nit: Since you're cleaning up style here anyway, please add a ';' after the return statement in the function body. 855885 6 193278 eustas 2013-03-15 04:29:58 -0700 Created attachment 193278 Patch 855886 7 193268 eustas 2013-03-15 04:30:24 -0700 Comment on attachment 193268 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193268&action=review >> Source/WebCore/inspector/front-end/NetworkRequest.js:615 >> + this._sortedResponseHeaders.sort(function(a, b) { return a.name.toLowerCase().compareTo(b.name.toLowerCase()) }); > > Nit: Since you're cleaning up style here anyway, please add a ';' after the return statement in the function body. Done. 856151 8 193278 webkit.review.bot 2013-03-15 11:49:34 -0700 Comment on attachment 193278 Patch Clearing flags on attachment: 193278 Committed r145926: <http://trac.webkit.org/changeset/145926> 856152 9 webkit.review.bot 2013-03-15 11:49:37 -0700 All reviewed patches have been landed. Closing bug. 193244 2013-03-15 00:05:17 -0700 2013-03-15 03:07:11 -0700 Patch bug-112412-20130315110112.patch text/plain 7409 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWRmNjEzMTQwYmMwYTM0 NTlmYjQ4NDNmMWYyMWJhODYxY2MyNmQ4Zi4uNTBiNjMwYzQ1YjJiMjc4MjYyYzcxN2ZhMTQzYTBi NDJiY2FlOGFmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAzLTE0ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtOZXR3b3JrXSBSZWZpbmUgSlNEb2NzIGluIE5ldHdvcmtSZXF1ZXN0LmpzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI0MTIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXR1cm4gdHlwZXMg Zm9yIHNvbWUgbWVtYmVycyBhcmUgY29uZnVzaW5nIChPYmplY3QpLgorCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qczogRml4ZWQgSlNEb2NzLgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanM6IERpdHRvLiBQbHVzIG1p bm9yIHJlZmFjdG9yaW5ncy4KKwogMjAxMy0wMy0xNCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNs b0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRmxhbWUgQ2hhcnQuIFN1 cHBvcnQgc2Nyb2xsaW5nIGJ5IGRyYWdnaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKaW5kZXggNDdkOGJjY2JkYjhiNGFk YWVlODEwYmUxODBlYjkxYjA4ODVkMDE5Mi4uN2ZkYmM5NTUwYzA0ZmM4NTA3ODVjNDI0MDEzOWNk ODRjYjZkYzY3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9OZXR3b3JrTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL05ldHdvcmtNYW5hZ2VyLmpzCkBAIC0xMjUsNyArMTI1LDcgQEAgV2ViSW5zcGVjdG9yLk5l dHdvcmtEaXNwYXRjaGVyID0gZnVuY3Rpb24obWFuYWdlcikKIFdlYkluc3BlY3Rvci5OZXR3b3Jr RGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtOZXR3b3Jr QWdlbnQuSGVhZGVyc30gaGVhZGVyc01hcAotICAgICAqIEByZXR1cm4ge0FycmF5LjxPYmplY3Q+ fQorICAgICAqIEByZXR1cm4geyFBcnJheS48IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5O YW1lVmFsdWU+fQogICAgICAqLwogICAgIF9oZWFkZXJzTWFwVG9IZWFkZXJzQXJyYXk6IGZ1bmN0 aW9uKGhlYWRlcnNNYXApCiAgICAgewpAQCAtMTMzLDcgKzEzMyw3IEBAIFdlYkluc3BlY3Rvci5O ZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZvciAodmFyIG5hbWUgaW4g aGVhZGVyc01hcCkgewogICAgICAgICAgICAgdmFyIHZhbHVlcyA9IGhlYWRlcnNNYXBbbmFtZV0u c3BsaXQoIlxuIik7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHZhbHVlcy5sZW5n dGg7ICsraSkKLSAgICAgICAgICAgICAgICByZXN1bHQucHVzaCh7IG5hbWU6IG5hbWUsIHZhbHVl OiB2YWx1ZXNbaV0gfSk7CisgICAgICAgICAgICAgICAgcmVzdWx0LnB1c2goe25hbWU6IG5hbWUs IHZhbHVlOiB2YWx1ZXNbaV19KTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gcmVzdWx0Owog ICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05l dHdvcmtSZXF1ZXN0LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrUmVxdWVzdC5qcwppbmRleCAxMjNlMmU2Y2U4MzBjMzkyZmQwZTZhZGZjZDAwMDhiMDk5NjRm NDgyLi44YTdmZmE1NmU5MGNkODNhMDRlMzlkNjQ0OGQwY2M2NmQ1MTAzNzRlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0LmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanMK QEAgLTczLDYgKzczLDEyIEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5Jbml0aWF0b3JU eXBlID0gewogICAgIE90aGVyOiAib3RoZXIiLAogfQogCisvKiogQHR5cGVkZWYge3tuYW1lOiBz dHJpbmcsIHZhbHVlOiBzdHJpbmd9fSAqLworV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5h bWVWYWx1ZTsKKworLyoqIEB0eXBlZGVmIHshTmV0d29ya0FnZW50LldlYlNvY2tldEZyYW1lfHtl cnJvck1lc3NhZ2U6IHN0cmluZywgdGltZTogbnVtYmVyfX0gKi8KK1dlYkluc3BlY3Rvci5OZXR3 b3JrUmVxdWVzdC5XZWJTb2NrZXRGcmFtZTsKKwogV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0 LnByb3RvdHlwZSA9IHsKICAgICAvKioKICAgICAgKiBAcmV0dXJuIHtOZXR3b3JrQWdlbnQuUmVx dWVzdElkfQpAQCAtNDUzLDcgKzQ1OSw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5w cm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEByZXR1cm4ge0FycmF5LjxP YmplY3Q+fQorICAgICAqIEByZXR1cm4geyFBcnJheS48IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVx dWVzdC5OYW1lVmFsdWU+fQogICAgICAqLwogICAgIGdldCByZXF1ZXN0SGVhZGVycygpCiAgICAg ewpAQCAtNDk4LDcgKzUwNCw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5wcm90b3R5 cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEByZXR1cm4ge0FycmF5LjxPYmplY3Q+ fQorICAgICAqIEByZXR1cm4geyFBcnJheS48IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5O YW1lVmFsdWU+fQogICAgICAqLwogICAgIGdldCBzb3J0ZWRSZXF1ZXN0SGVhZGVycygpCiAgICAg ewpAQCAtNTU1LDcgKzU2MSw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5wcm90b3R5 cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEByZXR1cm4ge0FycmF5LjxPYmplY3Q+ fQorICAgICAqIEByZXR1cm4geyFBcnJheS48IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5O YW1lVmFsdWU+fQogICAgICAqLwogICAgIGdldCByZXNwb25zZUhlYWRlcnMoKQogICAgIHsKQEAg LTYwMCwxNiArNjA2LDE2IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5wcm90b3R5cGUg PSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEByZXR1cm4ge0FycmF5LjxPYmplY3Q+fQor ICAgICAqIEByZXR1cm4geyFBcnJheS48IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5OYW1l VmFsdWU+fQogICAgICAqLwogICAgIGdldCBzb3J0ZWRSZXNwb25zZUhlYWRlcnMoKQogICAgIHsK ICAgICAgICAgaWYgKHRoaXMuX3NvcnRlZFJlc3BvbnNlSGVhZGVycyAhPT0gdW5kZWZpbmVkKQog ICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3NvcnRlZFJlc3BvbnNlSGVhZGVyczsKLSAgICAgICAg CisKICAgICAgICAgdGhpcy5fc29ydGVkUmVzcG9uc2VIZWFkZXJzID0gW107CiAgICAgICAgIHRo aXMuX3NvcnRlZFJlc3BvbnNlSGVhZGVycyA9IHRoaXMucmVzcG9uc2VIZWFkZXJzLnNsaWNlKCk7 Ci0gICAgICAgIHRoaXMuX3NvcnRlZFJlc3BvbnNlSGVhZGVycy5zb3J0KGZ1bmN0aW9uKGEsYikg eyByZXR1cm4gYS5uYW1lLnRvTG93ZXJDYXNlKCkuY29tcGFyZVRvKGIubmFtZS50b0xvd2VyQ2Fz ZSgpKSB9KTsKKyAgICAgICAgdGhpcy5fc29ydGVkUmVzcG9uc2VIZWFkZXJzLnNvcnQoZnVuY3Rp b24oYSwgYikgeyByZXR1cm4gYS5uYW1lLnRvTG93ZXJDYXNlKCkuY29tcGFyZVRvKGIubmFtZS50 b0xvd2VyQ2FzZSgpKSB9KTsKICAgICAgICAgcmV0dXJuIHRoaXMuX3NvcnRlZFJlc3BvbnNlSGVh ZGVyczsKICAgICB9LAogCkBAIC02NDcsNyArNjUzLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtS ZXF1ZXN0LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHJldHVybiB7 P0FycmF5LjxPYmplY3Q+fQorICAgICAqIEByZXR1cm4gez9BcnJheS48IVdlYkluc3BlY3Rvci5O ZXR3b3JrUmVxdWVzdC5OYW1lVmFsdWU+fQogICAgICAqLwogICAgIGdldCBxdWVyeVBhcmFtZXRl cnMoKQogICAgIHsKQEAgLTY2MSw3ICs2NjcsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVl c3QucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcmV0dXJuIHs/QXJy YXkuPE9iamVjdD59CisgICAgICogQHJldHVybiB7P0FycmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdv cmtSZXF1ZXN0Lk5hbWVWYWx1ZT59CiAgICAgICovCiAgICAgZ2V0IGZvcm1QYXJhbWV0ZXJzKCkK ICAgICB7CkBAIC02ODcsMzQgKzY5MywyNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3Qu cHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IHF1ZXJ5U3Ry aW5nCi0gICAgICogQHJldHVybiB7QXJyYXkuPE9iamVjdD59CisgICAgICogQHJldHVybiB7IUFy cmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5hbWVWYWx1ZT59CiAgICAgICovCiAg ICAgX3BhcnNlUGFyYW1ldGVyczogZnVuY3Rpb24ocXVlcnlTdHJpbmcpCiAgICAgewogICAgICAg ICBmdW5jdGlvbiBwYXJzZU5hbWVWYWx1ZShwYWlyKQogICAgICAgICB7Ci0gICAgICAgICAgICB2 YXIgcGFyYW1ldGVyID0ge307CiAgICAgICAgICAgICB2YXIgc3BsaXRQYWlyID0gcGFpci5zcGxp dCgiPSIsIDIpOwotCi0gICAgICAgICAgICBwYXJhbWV0ZXIubmFtZSA9IHNwbGl0UGFpclswXTsK LSAgICAgICAgICAgIGlmIChzcGxpdFBhaXIubGVuZ3RoID09PSAxKQotICAgICAgICAgICAgICAg IHBhcmFtZXRlci52YWx1ZSA9ICIiOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAg IHBhcmFtZXRlci52YWx1ZSA9IHNwbGl0UGFpclsxXTsKLSAgICAgICAgICAgIHJldHVybiBwYXJh bWV0ZXI7CisgICAgICAgICAgICByZXR1cm4ge25hbWU6IHNwbGl0UGFpclswXSwgdmFsdWU6IHNw bGl0UGFpclsxXSB8fCAiIn07CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHF1ZXJ5U3RyaW5n LnNwbGl0KCImIikubWFwKHBhcnNlTmFtZVZhbHVlKTsKICAgICB9LAogCiAgICAgLyoqCi0gICAg ICogQHBhcmFtIHtPYmplY3R9IGhlYWRlcnMKKyAgICAgKiBAcGFyYW0geyFBcnJheS48IVdlYklu c3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5OYW1lVmFsdWU+fSBoZWFkZXJzCiAgICAgICogQHBhcmFt IHtzdHJpbmd9IGhlYWRlck5hbWUKICAgICAgKiBAcmV0dXJuIHtzdHJpbmd8dW5kZWZpbmVkfQog ICAgICAqLwogICAgIF9oZWFkZXJWYWx1ZTogZnVuY3Rpb24oaGVhZGVycywgaGVhZGVyTmFtZSkK ICAgICB7CiAgICAgICAgIGhlYWRlck5hbWUgPSBoZWFkZXJOYW1lLnRvTG93ZXJDYXNlKCk7Ci0g ICAgICAgIAorCiAgICAgICAgIHZhciB2YWx1ZXMgPSBbXTsKICAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCBoZWFkZXJzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICBpZiAoaGVhZGVyc1tp XS5uYW1lLnRvTG93ZXJDYXNlKCkgPT09IGhlYWRlck5hbWUpCkBAIC04NzksNyArODc4LDcgQEAg V2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAg LyoqCi0gICAgICogQHJldHVybiB7T2JqZWN0fQorICAgICAqIEByZXR1cm4geyFBcnJheS48IVdl Ykluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5XZWJTb2NrZXRGcmFtZT59CiAgICAgICovCiAgICAg ZnJhbWVzOiBmdW5jdGlvbigpCiAgICAgewpAQCAtODg4LDcgKzg4Nyw3IEBAIFdlYkluc3BlY3Rv ci5OZXR3b3JrUmVxdWVzdC5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0g e251bWJlcn0gcG9zaXRpb24KLSAgICAgKiBAcmV0dXJuIHtPYmplY3R9CisgICAgICogQHJldHVy biB7V2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LldlYlNvY2tldEZyYW1lfHVuZGVmaW5lZH0K ICAgICAgKi8KICAgICBmcmFtZTogZnVuY3Rpb24ocG9zaXRpb24pCiAgICAgewpAQCAtOTAxLDE0 ICs5MDAsMTEgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsKICAg ICAgKi8KICAgICBhZGRGcmFtZUVycm9yOiBmdW5jdGlvbihlcnJvck1lc3NhZ2UsIHRpbWUpCiAg ICAgewotICAgICAgICB2YXIgZXJyb3JPYmplY3QgPSB7fTsKLSAgICAgICAgZXJyb3JPYmplY3Qu ZXJyb3JNZXNzYWdlID0gZXJyb3JNZXNzYWdlOwotICAgICAgICBlcnJvck9iamVjdC50aW1lID0g dGltZTsKLSAgICAgICAgdGhpcy5fcHVzaEZyYW1lKGVycm9yT2JqZWN0KTsKKyAgICAgICAgdGhp cy5fcHVzaEZyYW1lKHtlcnJvck1lc3NhZ2U6IGVycm9yTWVzc2FnZSwgdGltZTogdGltZX0pOwog ICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge09iamVjdH0gcmVzcG9uc2UKKyAgICAg KiBAcGFyYW0geyFOZXR3b3JrQWdlbnQuV2ViU29ja2V0RnJhbWV9IHJlc3BvbnNlCiAgICAgICog QHBhcmFtIHtudW1iZXJ9IHRpbWUKICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IHNlbnQKICAgICAg Ki8KQEAgLTkxNiwxNiArOTEyLDE4IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5wcm90 b3R5cGUgPSB7CiAgICAgewogICAgICAgICByZXNwb25zZS50aW1lID0gdGltZTsKICAgICAgICAg aWYgKHNlbnQpCi0gICAgICAgICAgICByZXNwb25zZS5zZW50ID0gdHJ1ZTsKKyAgICAgICAgICAg IHJlc3BvbnNlLnNlbnQgPSBzZW50OwogICAgICAgICB0aGlzLl9wdXNoRnJhbWUocmVzcG9uc2Up OwogICAgIH0sCiAKLSAgICBfcHVzaEZyYW1lOiBmdW5jdGlvbihvYmplY3QpCisgICAgLyoqCisg ICAgICogQHBhcmFtIHshV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LldlYlNvY2tldEZyYW1l fSBmcmFtZU9yRXJyb3IKKyAgICAgKi8KKyAgICBfcHVzaEZyYW1lOiBmdW5jdGlvbihmcmFtZU9y RXJyb3IpCiAgICAgewotICAgICAgICBpZiAodGhpcy5fZnJhbWVzLmxlbmd0aCA+PSAxMDApIHsK KyAgICAgICAgaWYgKHRoaXMuX2ZyYW1lcy5sZW5ndGggPj0gMTAwKQogICAgICAgICAgICAgdGhp cy5fZnJhbWVzLnNwbGljZSgwLCAxMCk7Ci0gICAgICAgIH0KLSAgICAgICAgdGhpcy5fZnJhbWVz LnB1c2gob2JqZWN0KTsKKyAgICAgICAgdGhpcy5fZnJhbWVzLnB1c2goZnJhbWVPckVycm9yKTsK ICAgICB9LAogCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZQo= 193268 2013-03-15 03:05:39 -0700 2013-03-15 04:30:24 -0700 Patch bug-112412-20130315140134.patch text/plain 7159 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmJjZmJlOTUzY2Q0NzJi NDAyZWU1ZWIwOWZjMDczYjk5Y2ViYmY4NC4uNzcxOTFjMzI4MWYwODU3ZTBmYWIwMzBhMTQxMjg5 ZjUwNjkxZTNmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAzLTE0ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtOZXR3b3JrXSBSZWZpbmUgSlNEb2NzIGluIE5ldHdvcmtSZXF1ZXN0LmpzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI0MTIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXR1cm4gdHlwZXMg Zm9yIHNvbWUgbWVtYmVycyBhcmUgY29uZnVzaW5nIChPYmplY3QpLgorCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qczogRml4ZWQgSlNEb2NzLgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanM6IERpdHRvLiBQbHVzIG1p bm9yIHJlZmFjdG9yaW5ncy4KKwogMjAxMy0wMy0xNSAgVGFrYXNoaSBTYWthbW90byAgPHRhc2Fr QGdvb2dsZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggYXQgUmVuZGVyU3R5bGU6OmluaGVyaXRGcm9t IHJlcG9ydGVkIGJ5IGZ1enplcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKaW5kZXggNDdkOGJjY2JkYjhiNGFkYWVlODEwYmUx ODBlYjkxYjA4ODVkMDE5Mi4uN2ZkYmM5NTUwYzA0ZmM4NTA3ODVjNDI0MDEzOWNkODRjYjZkYzY3 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3Jr TWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdv cmtNYW5hZ2VyLmpzCkBAIC0xMjUsNyArMTI1LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNw YXRjaGVyID0gZnVuY3Rpb24obWFuYWdlcikKIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hl ci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtOZXR3b3JrQWdlbnQuSGVh ZGVyc30gaGVhZGVyc01hcAotICAgICAqIEByZXR1cm4ge0FycmF5LjxPYmplY3Q+fQorICAgICAq IEByZXR1cm4geyFBcnJheS48IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5OYW1lVmFsdWU+ fQogICAgICAqLwogICAgIF9oZWFkZXJzTWFwVG9IZWFkZXJzQXJyYXk6IGZ1bmN0aW9uKGhlYWRl cnNNYXApCiAgICAgewpAQCAtMTMzLDcgKzEzMyw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlz cGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZvciAodmFyIG5hbWUgaW4gaGVhZGVyc01h cCkgewogICAgICAgICAgICAgdmFyIHZhbHVlcyA9IGhlYWRlcnNNYXBbbmFtZV0uc3BsaXQoIlxu Iik7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHZhbHVlcy5sZW5ndGg7ICsraSkK LSAgICAgICAgICAgICAgICByZXN1bHQucHVzaCh7IG5hbWU6IG5hbWUsIHZhbHVlOiB2YWx1ZXNb aV0gfSk7CisgICAgICAgICAgICAgICAgcmVzdWx0LnB1c2goe25hbWU6IG5hbWUsIHZhbHVlOiB2 YWx1ZXNbaV19KTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0sCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtSZXF1 ZXN0LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUmVxdWVz dC5qcwppbmRleCAxMjNlMmU2Y2U4MzBjMzkyZmQwZTZhZGZjZDAwMDhiMDk5NjRmNDgyLi4wNWRi MTc4OTljYmJjN2FhZDUzZTJhZDNlOGRhMzk3NGZhOWZkZDQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0LmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanMKQEAgLTczLDYg KzczLDkgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LkluaXRpYXRvclR5cGUgPSB7CiAg ICAgT3RoZXI6ICJvdGhlciIsCiB9CiAKKy8qKiBAdHlwZWRlZiB7e25hbWU6IHN0cmluZywgdmFs dWU6IHN0cmluZ319ICovCitXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3QuTmFtZVZhbHVlOwor CiBXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3QucHJvdG90eXBlID0gewogICAgIC8qKgogICAg ICAqIEByZXR1cm4ge05ldHdvcmtBZ2VudC5SZXF1ZXN0SWR9CkBAIC00NTMsNyArNDU2LDcgQEAg V2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAg LyoqCi0gICAgICogQHJldHVybiB7QXJyYXkuPE9iamVjdD59CisgICAgICogQHJldHVybiB7IUFy cmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5hbWVWYWx1ZT59CiAgICAgICovCiAg ICAgZ2V0IHJlcXVlc3RIZWFkZXJzKCkKICAgICB7CkBAIC00OTgsNyArNTAxLDcgQEAgV2ViSW5z cGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0g ICAgICogQHJldHVybiB7QXJyYXkuPE9iamVjdD59CisgICAgICogQHJldHVybiB7IUFycmF5Ljwh V2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5hbWVWYWx1ZT59CiAgICAgICovCiAgICAgZ2V0 IHNvcnRlZFJlcXVlc3RIZWFkZXJzKCkKICAgICB7CkBAIC01NTUsNyArNTU4LDcgQEAgV2ViSW5z cGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0g ICAgICogQHJldHVybiB7QXJyYXkuPE9iamVjdD59CisgICAgICogQHJldHVybiB7IUFycmF5Ljwh V2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5hbWVWYWx1ZT59CiAgICAgICovCiAgICAgZ2V0 IHJlc3BvbnNlSGVhZGVycygpCiAgICAgewpAQCAtNjAwLDE2ICs2MDMsMTYgQEAgV2ViSW5zcGVj dG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAg ICogQHJldHVybiB7QXJyYXkuPE9iamVjdD59CisgICAgICogQHJldHVybiB7IUFycmF5LjwhV2Vi SW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5hbWVWYWx1ZT59CiAgICAgICovCiAgICAgZ2V0IHNv cnRlZFJlc3BvbnNlSGVhZGVycygpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fc29ydGVkUmVz cG9uc2VIZWFkZXJzICE9PSB1bmRlZmluZWQpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5fc29y dGVkUmVzcG9uc2VIZWFkZXJzOwotICAgICAgICAKKwogICAgICAgICB0aGlzLl9zb3J0ZWRSZXNw b25zZUhlYWRlcnMgPSBbXTsKICAgICAgICAgdGhpcy5fc29ydGVkUmVzcG9uc2VIZWFkZXJzID0g dGhpcy5yZXNwb25zZUhlYWRlcnMuc2xpY2UoKTsKLSAgICAgICAgdGhpcy5fc29ydGVkUmVzcG9u c2VIZWFkZXJzLnNvcnQoZnVuY3Rpb24oYSxiKSB7IHJldHVybiBhLm5hbWUudG9Mb3dlckNhc2Uo KS5jb21wYXJlVG8oYi5uYW1lLnRvTG93ZXJDYXNlKCkpIH0pOworICAgICAgICB0aGlzLl9zb3J0 ZWRSZXNwb25zZUhlYWRlcnMuc29ydChmdW5jdGlvbihhLCBiKSB7IHJldHVybiBhLm5hbWUudG9M b3dlckNhc2UoKS5jb21wYXJlVG8oYi5uYW1lLnRvTG93ZXJDYXNlKCkpIH0pOwogICAgICAgICBy ZXR1cm4gdGhpcy5fc29ydGVkUmVzcG9uc2VIZWFkZXJzOwogICAgIH0sCiAKQEAgLTY0Nyw3ICs2 NTAsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3QucHJvdG90eXBlID0gewogICAgIH0s CiAKICAgICAvKioKLSAgICAgKiBAcmV0dXJuIHs/QXJyYXkuPE9iamVjdD59CisgICAgICogQHJl dHVybiB7P0FycmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5hbWVWYWx1ZT59CiAg ICAgICovCiAgICAgZ2V0IHF1ZXJ5UGFyYW1ldGVycygpCiAgICAgewpAQCAtNjYxLDcgKzY2NCw3 IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAog ICAgIC8qKgotICAgICAqIEByZXR1cm4gez9BcnJheS48T2JqZWN0Pn0KKyAgICAgKiBAcmV0dXJu IHs/QXJyYXkuPCFXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3QuTmFtZVZhbHVlPn0KICAgICAg Ki8KICAgICBnZXQgZm9ybVBhcmFtZXRlcnMoKQogICAgIHsKQEAgLTY4NywzNCArNjkwLDI3IEBA IFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAg ICAgKiBAcGFyYW0ge3N0cmluZ30gcXVlcnlTdHJpbmcKLSAgICAgKiBAcmV0dXJuIHtBcnJheS48 T2JqZWN0Pn0KKyAgICAgKiBAcmV0dXJuIHshQXJyYXkuPCFXZWJJbnNwZWN0b3IuTmV0d29ya1Jl cXVlc3QuTmFtZVZhbHVlPn0KICAgICAgKi8KICAgICBfcGFyc2VQYXJhbWV0ZXJzOiBmdW5jdGlv bihxdWVyeVN0cmluZykKICAgICB7CiAgICAgICAgIGZ1bmN0aW9uIHBhcnNlTmFtZVZhbHVlKHBh aXIpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHZhciBwYXJhbWV0ZXIgPSB7fTsKICAgICAgICAg ICAgIHZhciBzcGxpdFBhaXIgPSBwYWlyLnNwbGl0KCI9IiwgMik7Ci0KLSAgICAgICAgICAgIHBh cmFtZXRlci5uYW1lID0gc3BsaXRQYWlyWzBdOwotICAgICAgICAgICAgaWYgKHNwbGl0UGFpci5s ZW5ndGggPT09IDEpCi0gICAgICAgICAgICAgICAgcGFyYW1ldGVyLnZhbHVlID0gIiI7Ci0gICAg ICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgcGFyYW1ldGVyLnZhbHVlID0gc3BsaXRQYWly WzFdOwotICAgICAgICAgICAgcmV0dXJuIHBhcmFtZXRlcjsKKyAgICAgICAgICAgIHJldHVybiB7 bmFtZTogc3BsaXRQYWlyWzBdLCB2YWx1ZTogc3BsaXRQYWlyWzFdIHx8ICIifTsKICAgICAgICAg fQogICAgICAgICByZXR1cm4gcXVlcnlTdHJpbmcuc3BsaXQoIiYiKS5tYXAocGFyc2VOYW1lVmFs dWUpOwogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge09iamVjdH0gaGVhZGVycwor ICAgICAqIEBwYXJhbSB7IUFycmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5hbWVW YWx1ZT59IGhlYWRlcnMKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gaGVhZGVyTmFtZQogICAgICAq IEByZXR1cm4ge3N0cmluZ3x1bmRlZmluZWR9CiAgICAgICovCiAgICAgX2hlYWRlclZhbHVlOiBm dW5jdGlvbihoZWFkZXJzLCBoZWFkZXJOYW1lKQogICAgIHsKICAgICAgICAgaGVhZGVyTmFtZSA9 IGhlYWRlck5hbWUudG9Mb3dlckNhc2UoKTsKLSAgICAgICAgCisKICAgICAgICAgdmFyIHZhbHVl cyA9IFtdOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGhlYWRlcnMubGVuZ3RoOyArK2kp IHsKICAgICAgICAgICAgIGlmIChoZWFkZXJzW2ldLm5hbWUudG9Mb3dlckNhc2UoKSA9PT0gaGVh ZGVyTmFtZSkKQEAgLTg3OSw3ICs4NzUsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3Qu cHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcmV0dXJuIHtPYmplY3R9 CisgICAgICogQHJldHVybiB7IUFycmF5LjwhT2JqZWN0Pn0KICAgICAgKi8KICAgICBmcmFtZXM6 IGZ1bmN0aW9uKCkKICAgICB7CkBAIC04ODgsNyArODg0LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdv cmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7bnVtYmVy fSBwb3NpdGlvbgotICAgICAqIEByZXR1cm4ge09iamVjdH0KKyAgICAgKiBAcmV0dXJuIHtPYmpl Y3R8dW5kZWZpbmVkfQogICAgICAqLwogICAgIGZyYW1lOiBmdW5jdGlvbihwb3NpdGlvbikKICAg ICB7CkBAIC05MDEsMTQgKzg5NywxMSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3QucHJv dG90eXBlID0gewogICAgICAqLwogICAgIGFkZEZyYW1lRXJyb3I6IGZ1bmN0aW9uKGVycm9yTWVz c2FnZSwgdGltZSkKICAgICB7Ci0gICAgICAgIHZhciBlcnJvck9iamVjdCA9IHt9OwotICAgICAg ICBlcnJvck9iamVjdC5lcnJvck1lc3NhZ2UgPSBlcnJvck1lc3NhZ2U7Ci0gICAgICAgIGVycm9y T2JqZWN0LnRpbWUgPSB0aW1lOwotICAgICAgICB0aGlzLl9wdXNoRnJhbWUoZXJyb3JPYmplY3Qp OworICAgICAgICB0aGlzLl9wdXNoRnJhbWUoe2Vycm9yTWVzc2FnZTogZXJyb3JNZXNzYWdlLCB0 aW1lOiB0aW1lfSk7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7T2JqZWN0fSBy ZXNwb25zZQorICAgICAqIEBwYXJhbSB7IU5ldHdvcmtBZ2VudC5XZWJTb2NrZXRGcmFtZX0gcmVz cG9uc2UKICAgICAgKiBAcGFyYW0ge251bWJlcn0gdGltZQogICAgICAqIEBwYXJhbSB7Ym9vbGVh bn0gc2VudAogICAgICAqLwpAQCAtOTE2LDE2ICs5MDksMTggQEAgV2ViSW5zcGVjdG9yLk5ldHdv cmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHJlc3BvbnNlLnRpbWUgPSB0 aW1lOwogICAgICAgICBpZiAoc2VudCkKLSAgICAgICAgICAgIHJlc3BvbnNlLnNlbnQgPSB0cnVl OworICAgICAgICAgICAgcmVzcG9uc2Uuc2VudCA9IHNlbnQ7CiAgICAgICAgIHRoaXMuX3B1c2hG cmFtZShyZXNwb25zZSk7CiAgICAgfSwKIAotICAgIF9wdXNoRnJhbWU6IGZ1bmN0aW9uKG9iamVj dCkKKyAgICAvKioKKyAgICAgKiBAcGFyYW0geyFPYmplY3R9IGZyYW1lT3JFcnJvcgorICAgICAq LworICAgIF9wdXNoRnJhbWU6IGZ1bmN0aW9uKGZyYW1lT3JFcnJvcikKICAgICB7Ci0gICAgICAg IGlmICh0aGlzLl9mcmFtZXMubGVuZ3RoID49IDEwMCkgeworICAgICAgICBpZiAodGhpcy5fZnJh bWVzLmxlbmd0aCA+PSAxMDApCiAgICAgICAgICAgICB0aGlzLl9mcmFtZXMuc3BsaWNlKDAsIDEw KTsKLSAgICAgICAgfQotICAgICAgICB0aGlzLl9mcmFtZXMucHVzaChvYmplY3QpOworICAgICAg ICB0aGlzLl9mcmFtZXMucHVzaChmcmFtZU9yRXJyb3IpOwogICAgIH0sCiAKICAgICBfX3Byb3Rv X186IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlCg== 193278 2013-03-15 04:29:58 -0700 2013-03-15 11:49:34 -0700 Patch bug-112412-20130315152553.patch text/plain 7181 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmViNDczNjAxY2U2YzMw ZjY3YjNkNzEwNTIyNDgxY2EzOGI4NTg4Yy4uMzRiMTU0OWNkNzcwNmU4M2QzODBkOTVhMmI1MWMz NTMxODZhMGY0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAzLTE0ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtOZXR3b3JrXSBSZWZpbmUgSlNEb2NzIGluIE5ldHdvcmtSZXF1ZXN0LmpzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI0MTIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXR1cm4gdHlwZXMg Zm9yIHNvbWUgbWVtYmVycyBhcmUgY29uZnVzaW5nIChPYmplY3QpLgorCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qczogRml4ZWQgSlNEb2NzLgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanM6IERpdHRvLiBQbHVzIG1p bm9yIHJlZmFjdG9yaW5ncy4KKwogMjAxMy0wMy0xNSAgTWFyamEgSMO2bHR0w6QgIDxtYXJqYUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBBZGQgbWFjaGluZXJ5IGZvciBnZW5lcmF0aW5n IHNwZWNpYWxpemVkIGJpbmRpbmdzIGZvciB0aGUgbWFpbiB3b3JsZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKaW5kZXggNDdk OGJjY2JkYjhiNGFkYWVlODEwYmUxODBlYjkxYjA4ODVkMDE5Mi4uN2ZkYmM5NTUwYzA0ZmM4NTA3 ODVjNDI0MDEzOWNkODRjYjZkYzY3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCkBAIC0xMjUsNyArMTI1LDcgQEAgV2Vi SW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyID0gZnVuY3Rpb24obWFuYWdlcikKIFdlYkluc3Bl Y3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHBh cmFtIHtOZXR3b3JrQWdlbnQuSGVhZGVyc30gaGVhZGVyc01hcAotICAgICAqIEByZXR1cm4ge0Fy cmF5LjxPYmplY3Q+fQorICAgICAqIEByZXR1cm4geyFBcnJheS48IVdlYkluc3BlY3Rvci5OZXR3 b3JrUmVxdWVzdC5OYW1lVmFsdWU+fQogICAgICAqLwogICAgIF9oZWFkZXJzTWFwVG9IZWFkZXJz QXJyYXk6IGZ1bmN0aW9uKGhlYWRlcnNNYXApCiAgICAgewpAQCAtMTMzLDcgKzEzMyw3IEBAIFdl Ykluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZvciAo dmFyIG5hbWUgaW4gaGVhZGVyc01hcCkgewogICAgICAgICAgICAgdmFyIHZhbHVlcyA9IGhlYWRl cnNNYXBbbmFtZV0uc3BsaXQoIlxuIik7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8 IHZhbHVlcy5sZW5ndGg7ICsraSkKLSAgICAgICAgICAgICAgICByZXN1bHQucHVzaCh7IG5hbWU6 IG5hbWUsIHZhbHVlOiB2YWx1ZXNbaV0gfSk7CisgICAgICAgICAgICAgICAgcmVzdWx0LnB1c2go e25hbWU6IG5hbWUsIHZhbHVlOiB2YWx1ZXNbaV19KTsKICAgICAgICAgfQogICAgICAgICByZXR1 cm4gcmVzdWx0OwogICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9OZXR3b3JrUmVxdWVzdC5qcwppbmRleCAxMjNlMmU2Y2U4MzBjMzkyZmQwZTZhZGZj ZDAwMDhiMDk5NjRmNDgyLi45OGIxY2VmYWRlZDlmOWQ1NmIwMzcyN2QyODdmYmZkNjY0YjdjMDBj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtS ZXF1ZXN0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29y a1JlcXVlc3QuanMKQEAgLTczLDYgKzczLDkgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0 LkluaXRpYXRvclR5cGUgPSB7CiAgICAgT3RoZXI6ICJvdGhlciIsCiB9CiAKKy8qKiBAdHlwZWRl ZiB7e25hbWU6IHN0cmluZywgdmFsdWU6IHN0cmluZ319ICovCitXZWJJbnNwZWN0b3IuTmV0d29y a1JlcXVlc3QuTmFtZVZhbHVlOworCiBXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3QucHJvdG90 eXBlID0gewogICAgIC8qKgogICAgICAqIEByZXR1cm4ge05ldHdvcmtBZ2VudC5SZXF1ZXN0SWR9 CkBAIC00NTMsNyArNDU2LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlw ZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHJldHVybiB7QXJyYXkuPE9iamVjdD59 CisgICAgICogQHJldHVybiB7IUFycmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5h bWVWYWx1ZT59CiAgICAgICovCiAgICAgZ2V0IHJlcXVlc3RIZWFkZXJzKCkKICAgICB7CkBAIC00 OTgsNyArNTAxLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsK ICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHJldHVybiB7QXJyYXkuPE9iamVjdD59CisgICAg ICogQHJldHVybiB7IUFycmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5hbWVWYWx1 ZT59CiAgICAgICovCiAgICAgZ2V0IHNvcnRlZFJlcXVlc3RIZWFkZXJzKCkKICAgICB7CkBAIC01 NTUsNyArNTU4LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsK ICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHJldHVybiB7QXJyYXkuPE9iamVjdD59CisgICAg ICogQHJldHVybiB7IUFycmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5hbWVWYWx1 ZT59CiAgICAgICovCiAgICAgZ2V0IHJlc3BvbnNlSGVhZGVycygpCiAgICAgewpAQCAtNjAwLDE2 ICs2MDMsMTYgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsKICAg ICB9LAogCiAgICAgLyoqCi0gICAgICogQHJldHVybiB7QXJyYXkuPE9iamVjdD59CisgICAgICog QHJldHVybiB7IUFycmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5hbWVWYWx1ZT59 CiAgICAgICovCiAgICAgZ2V0IHNvcnRlZFJlc3BvbnNlSGVhZGVycygpCiAgICAgewogICAgICAg ICBpZiAodGhpcy5fc29ydGVkUmVzcG9uc2VIZWFkZXJzICE9PSB1bmRlZmluZWQpCiAgICAgICAg ICAgICByZXR1cm4gdGhpcy5fc29ydGVkUmVzcG9uc2VIZWFkZXJzOwotICAgICAgICAKKwogICAg ICAgICB0aGlzLl9zb3J0ZWRSZXNwb25zZUhlYWRlcnMgPSBbXTsKICAgICAgICAgdGhpcy5fc29y dGVkUmVzcG9uc2VIZWFkZXJzID0gdGhpcy5yZXNwb25zZUhlYWRlcnMuc2xpY2UoKTsKLSAgICAg ICAgdGhpcy5fc29ydGVkUmVzcG9uc2VIZWFkZXJzLnNvcnQoZnVuY3Rpb24oYSxiKSB7IHJldHVy biBhLm5hbWUudG9Mb3dlckNhc2UoKS5jb21wYXJlVG8oYi5uYW1lLnRvTG93ZXJDYXNlKCkpIH0p OworICAgICAgICB0aGlzLl9zb3J0ZWRSZXNwb25zZUhlYWRlcnMuc29ydChmdW5jdGlvbihhLCBi KSB7IHJldHVybiBhLm5hbWUudG9Mb3dlckNhc2UoKS5jb21wYXJlVG8oYi5uYW1lLnRvTG93ZXJD YXNlKCkpOyB9KTsKICAgICAgICAgcmV0dXJuIHRoaXMuX3NvcnRlZFJlc3BvbnNlSGVhZGVyczsK ICAgICB9LAogCkBAIC02NDcsNyArNjUwLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0 LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHJldHVybiB7P0FycmF5 LjxPYmplY3Q+fQorICAgICAqIEByZXR1cm4gez9BcnJheS48IVdlYkluc3BlY3Rvci5OZXR3b3Jr UmVxdWVzdC5OYW1lVmFsdWU+fQogICAgICAqLwogICAgIGdldCBxdWVyeVBhcmFtZXRlcnMoKQog ICAgIHsKQEAgLTY2MSw3ICs2NjQsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3QucHJv dG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcmV0dXJuIHs/QXJyYXkuPE9i amVjdD59CisgICAgICogQHJldHVybiB7P0FycmF5LjwhV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1 ZXN0Lk5hbWVWYWx1ZT59CiAgICAgICovCiAgICAgZ2V0IGZvcm1QYXJhbWV0ZXJzKCkKICAgICB7 CkBAIC02ODcsMzQgKzY5MCwyNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3QucHJvdG90 eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IHF1ZXJ5U3RyaW5nCi0g ICAgICogQHJldHVybiB7QXJyYXkuPE9iamVjdD59CisgICAgICogQHJldHVybiB7IUFycmF5Ljwh V2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0Lk5hbWVWYWx1ZT59CiAgICAgICovCiAgICAgX3Bh cnNlUGFyYW1ldGVyczogZnVuY3Rpb24ocXVlcnlTdHJpbmcpCiAgICAgewogICAgICAgICBmdW5j dGlvbiBwYXJzZU5hbWVWYWx1ZShwYWlyKQogICAgICAgICB7Ci0gICAgICAgICAgICB2YXIgcGFy YW1ldGVyID0ge307CiAgICAgICAgICAgICB2YXIgc3BsaXRQYWlyID0gcGFpci5zcGxpdCgiPSIs IDIpOwotCi0gICAgICAgICAgICBwYXJhbWV0ZXIubmFtZSA9IHNwbGl0UGFpclswXTsKLSAgICAg ICAgICAgIGlmIChzcGxpdFBhaXIubGVuZ3RoID09PSAxKQotICAgICAgICAgICAgICAgIHBhcmFt ZXRlci52YWx1ZSA9ICIiOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHBhcmFt ZXRlci52YWx1ZSA9IHNwbGl0UGFpclsxXTsKLSAgICAgICAgICAgIHJldHVybiBwYXJhbWV0ZXI7 CisgICAgICAgICAgICByZXR1cm4ge25hbWU6IHNwbGl0UGFpclswXSwgdmFsdWU6IHNwbGl0UGFp clsxXSB8fCAiIn07CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHF1ZXJ5U3RyaW5nLnNwbGl0 KCImIikubWFwKHBhcnNlTmFtZVZhbHVlKTsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBh cmFtIHtPYmplY3R9IGhlYWRlcnMKKyAgICAgKiBAcGFyYW0geyFBcnJheS48IVdlYkluc3BlY3Rv ci5OZXR3b3JrUmVxdWVzdC5OYW1lVmFsdWU+fSBoZWFkZXJzCiAgICAgICogQHBhcmFtIHtzdHJp bmd9IGhlYWRlck5hbWUKICAgICAgKiBAcmV0dXJuIHtzdHJpbmd8dW5kZWZpbmVkfQogICAgICAq LwogICAgIF9oZWFkZXJWYWx1ZTogZnVuY3Rpb24oaGVhZGVycywgaGVhZGVyTmFtZSkKICAgICB7 CiAgICAgICAgIGhlYWRlck5hbWUgPSBoZWFkZXJOYW1lLnRvTG93ZXJDYXNlKCk7Ci0gICAgICAg IAorCiAgICAgICAgIHZhciB2YWx1ZXMgPSBbXTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCBoZWFkZXJzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICBpZiAoaGVhZGVyc1tpXS5uYW1l LnRvTG93ZXJDYXNlKCkgPT09IGhlYWRlck5hbWUpCkBAIC04NzksNyArODc1LDcgQEAgV2ViSW5z cGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0g ICAgICogQHJldHVybiB7T2JqZWN0fQorICAgICAqIEByZXR1cm4geyFBcnJheS48IU9iamVjdD59 CiAgICAgICovCiAgICAgZnJhbWVzOiBmdW5jdGlvbigpCiAgICAgewpAQCAtODg4LDcgKzg4NCw3 IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5wcm90b3R5cGUgPSB7CiAKICAgICAvKioK ICAgICAgKiBAcGFyYW0ge251bWJlcn0gcG9zaXRpb24KLSAgICAgKiBAcmV0dXJuIHtPYmplY3R9 CisgICAgICogQHJldHVybiB7T2JqZWN0fHVuZGVmaW5lZH0KICAgICAgKi8KICAgICBmcmFtZTog ZnVuY3Rpb24ocG9zaXRpb24pCiAgICAgewpAQCAtOTAxLDE0ICs4OTcsMTEgQEAgV2ViSW5zcGVj dG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBhZGRGcmFtZUVy cm9yOiBmdW5jdGlvbihlcnJvck1lc3NhZ2UsIHRpbWUpCiAgICAgewotICAgICAgICB2YXIgZXJy b3JPYmplY3QgPSB7fTsKLSAgICAgICAgZXJyb3JPYmplY3QuZXJyb3JNZXNzYWdlID0gZXJyb3JN ZXNzYWdlOwotICAgICAgICBlcnJvck9iamVjdC50aW1lID0gdGltZTsKLSAgICAgICAgdGhpcy5f cHVzaEZyYW1lKGVycm9yT2JqZWN0KTsKKyAgICAgICAgdGhpcy5fcHVzaEZyYW1lKHtlcnJvck1l c3NhZ2U6IGVycm9yTWVzc2FnZSwgdGltZTogdGltZX0pOwogICAgIH0sCiAKICAgICAvKioKLSAg ICAgKiBAcGFyYW0ge09iamVjdH0gcmVzcG9uc2UKKyAgICAgKiBAcGFyYW0geyFOZXR3b3JrQWdl bnQuV2ViU29ja2V0RnJhbWV9IHJlc3BvbnNlCiAgICAgICogQHBhcmFtIHtudW1iZXJ9IHRpbWUK ICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IHNlbnQKICAgICAgKi8KQEAgLTkxNiwxNiArOTA5LDE4 IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5wcm90b3R5cGUgPSB7CiAgICAgewogICAg ICAgICByZXNwb25zZS50aW1lID0gdGltZTsKICAgICAgICAgaWYgKHNlbnQpCi0gICAgICAgICAg ICByZXNwb25zZS5zZW50ID0gdHJ1ZTsKKyAgICAgICAgICAgIHJlc3BvbnNlLnNlbnQgPSBzZW50 OwogICAgICAgICB0aGlzLl9wdXNoRnJhbWUocmVzcG9uc2UpOwogICAgIH0sCiAKLSAgICBfcHVz aEZyYW1lOiBmdW5jdGlvbihvYmplY3QpCisgICAgLyoqCisgICAgICogQHBhcmFtIHshT2JqZWN0 fSBmcmFtZU9yRXJyb3IKKyAgICAgKi8KKyAgICBfcHVzaEZyYW1lOiBmdW5jdGlvbihmcmFtZU9y RXJyb3IpCiAgICAgewotICAgICAgICBpZiAodGhpcy5fZnJhbWVzLmxlbmd0aCA+PSAxMDApIHsK KyAgICAgICAgaWYgKHRoaXMuX2ZyYW1lcy5sZW5ndGggPj0gMTAwKQogICAgICAgICAgICAgdGhp cy5fZnJhbWVzLnNwbGljZSgwLCAxMCk7Ci0gICAgICAgIH0KLSAgICAgICAgdGhpcy5fZnJhbWVz LnB1c2gob2JqZWN0KTsKKyAgICAgICAgdGhpcy5fZnJhbWVzLnB1c2goZnJhbWVPckVycm9yKTsK ICAgICB9LAogCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZQo=