113327 2013-03-26 11:11:47 -0700 Web Inspector: Exception in console on attempt to filter javascript messages. 2013-04-01 08:25:10 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 zvorygin webkit-unassigned apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 863852 0 zvorygin 2013-03-26 11:11:47 -0700 Exception in console on attempt to filter javascript messages by source if console groups are used. 863872 1 195127 zvorygin 2013-03-26 11:38:23 -0700 Created attachment 195127 Patch 864347 2 195127 pfeldman 2013-03-27 03:13:28 -0700 Comment on attachment 195127 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195127&action=review > Source/WebCore/inspector/front-end/ConsoleMessage.js:779 > + if (!this._element) return; return should be on the next line > Source/WebCore/inspector/front-end/ConsoleView.js:559 > + } else if (sourceMessage.type === WebInspector.ConsoleMessage.MessageType.StartGroup || sourceMessage.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed) { This needs a test > Source/WebCore/inspector/front-end/ConsoleView.js:673 > + this._messages.push(message); Let migrate tests back to this._messages 864526 3 195315 zvorygin 2013-03-27 07:28:07 -0700 Created attachment 195315 Patch 864536 4 195127 zvorygin 2013-03-27 07:36:06 -0700 Comment on attachment 195127 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195127&action=review >> Source/WebCore/inspector/front-end/ConsoleMessage.js:779 >> + if (!this._element) return; > > return should be on the next line Done. >> Source/WebCore/inspector/front-end/ConsoleView.js:559 >> + } else if (sourceMessage.type === WebInspector.ConsoleMessage.MessageType.StartGroup || sourceMessage.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed) { > > This needs a test Added tests. >> Source/WebCore/inspector/front-end/ConsoleView.js:673 >> + this._messages.push(message); > > Let migrate tests back to this._messages Tests shouldn't use _messages field, but instead use DOM generated by console. 865377 5 195315 pfeldman 2013-03-28 05:26:31 -0700 Comment on attachment 195315 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195315&action=review > LayoutTests/inspector/console/console-filter-test.html:17 > + log1(i + "topGroup"); // from console-filter-test.html Please don't change the tests when doing refactorings - it is hard to spot the regression and merge if necessary. 865401 6 195315 zvorygin 2013-03-28 05:55:02 -0700 Comment on attachment 195315 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195315&action=review >> LayoutTests/inspector/console/console-filter-test.html:17 >> + log1(i + "topGroup"); // from console-filter-test.html > > Please don't change the tests when doing refactorings - it is hard to spot the regression and merge if necessary. That's the test which I wrote, and which originally worked fine(before and after refactoring). I just made this test to cover additional group-related cases. 867109 7 195966 zvorygin 2013-04-01 07:24:37 -0700 Created attachment 195966 Patch 867132 8 webkit.review.bot 2013-04-01 08:23:38 -0700 The commit-queue encountered the following flaky tests while processing attachment 195966: fast/preloader/document-write-noscript.html bug 113464 (authors: rniwa@webkit.org and tonyg@chromium.org) The commit-queue is continuing to process your patch. 867134 9 195966 webkit.review.bot 2013-04-01 08:25:06 -0700 Comment on attachment 195966 Patch Clearing flags on attachment: 195966 Committed r147327: <http://trac.webkit.org/changeset/147327> 867136 10 webkit.review.bot 2013-04-01 08:25:10 -0700 All reviewed patches have been landed. Closing bug. 195127 2013-03-26 11:38:23 -0700 2013-03-27 07:36:06 -0700 Patch bug-113327-20130326223405.patch text/plain 8629 zvorygin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2OTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQyNzUwOTM3Zjg3ZTI4 NDQyZGZhODViZjE2MjkxNDNlMTYxOWM1MC4uOGY4Y2UxNTNkNDY2NmNmNGY0ZjFiNzViZTEyZjAy YWJjYmE1MTkzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAzLTI2ICBEbWl0 cnkgWnZvcnlnaW4gIDx6dm9yeWdpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogRXhjZXB0aW9uIGluIGNvbnNvbGUgb24gYXR0ZW1wdCB0byBmaWx0ZXIgamF2YXNjcmlw dCBtZXNzYWdlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMzMyNworCisgICAgICAgIEZpeGVkIG5vbi1jc3MgZmlsdHJhdGlvbiBpZiBjb25zb2xl IG1lc3NhZ2UgZ3JvdXBzIGFyZSBwcmVzZW50LiBNZXNzYWdlIGdyb3VwcyBlbGVtZW50cyBhcmUg YWx3YXlzIHNob3duIGFuZCBhcmUKKyAgICAgICAgbmV2ZXIgZmlsdGVyZWQgb3V0LgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlTWVzc2FnZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xl TWVzc2FnZUltcGwucHJvdG90eXBlLnVwZGF0ZVJlcGVhdENvdW50KToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNv bnNvbGVWaWV3LmdldCB0aGlzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5w cm90b3R5cGUuX2NvbnNvbGVNZXNzYWdlQWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNv bnNvbGVWaWV3LnByb3RvdHlwZS5fY29uc29sZUNsZWFyZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fc2hvdWxkQmVWaXNpYmxlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuX3VwZGF0ZU1lc3NhZ2VMaXN0KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuX3ByaW50UmVzdWx0KToK KwogMjAxMy0wMy0yNiAgUGV0ZXIgUnliaW4gIDxwcnliaW5AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IHJlZmFjdG9yIGNvZGUgZHVwbGljYXRpb246IFdlYkluc3BlY3Rv ci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50LndyYXBQcm9wZXJ0eUFzRWxlbWVudHMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2Uu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpz CmluZGV4IDQ0NzM3MDE0NDgyNDY2YzU1ZDJjMmVhZjM3NDNkNTVkMGI2YTZlNzYuLjRkMDk5MWM2 YzdjNDRkZmRmMGNhYTViNWY2NzA0NmJlNDIzYTM4ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qcwpAQCAtNzc2LDYgKzc3 Niw4IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZUltcGwucHJvdG90eXBlID0gewogICAg IH0sCiAKICAgICB1cGRhdGVSZXBlYXRDb3VudDogZnVuY3Rpb24oKSB7CisgICAgICAgIGlmICgh dGhpcy5fZWxlbWVudCkgcmV0dXJuOworCiAgICAgICAgIGlmICghdGhpcy5yZXBlYXRDb3VudEVs ZW1lbnQpIHsKICAgICAgICAgICAgIHRoaXMucmVwZWF0Q291bnRFbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgic3BhbiIpOwogICAgICAgICAgICAgdGhpcy5yZXBlYXRDb3VudEVsZW1l bnQuY2xhc3NOYW1lID0gImJ1YmJsZSI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRleCA5MDA3Y2M5NGFmMDkyMTM4MmQ0NzQ2MWE2 YmY2NTVhYmVmYzFiMTdjLi41MzdjOTA3NWVhODNhYjc2YjczNTMyMDZkMzM0NDQ5OTdlOTQ3YjUw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZp ZXcuanMKQEAgLTM5LDYgKzM5LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3ID0gZnVuY3Rp b24oaGlkZUNvbnRleHRTZWxlY3RvcikKICAgICB0aGlzLmVsZW1lbnQuaWQgPSAiY29uc29sZS12 aWV3IjsKICAgICB0aGlzLl9tZXNzYWdlVVJMRmlsdGVycyA9IFdlYkluc3BlY3Rvci5zZXR0aW5n cy5tZXNzYWdlVVJMRmlsdGVycy5nZXQoKTsKICAgICB0aGlzLl92aXNpYmxlTWVzc2FnZXMgPSBb XTsKKyAgICB0aGlzLl9tZXNzYWdlcyA9IFtdOwogICAgIHRoaXMuX3VybFRvTWVzc2FnZUNvdW50 ID0ge307CiAKICAgICB0aGlzLl9jbGVhckNvbnNvbGVCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9y LlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsZWFyIGNvbnNvbGUgbG9n LiIpLCAiY2xlYXItc3RhdHVzLWJhci1pdGVtIik7CkBAIC0zODQsNiArMzg1LDggQEAgV2ViSW5z cGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICBfY29uc29sZU1lc3NhZ2VBZGRl ZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB2YXIgbWVzc2FnZSA9IC8qKiBAdHlw ZSB7V2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlfSAqLyAoZXZlbnQuZGF0YSk7CisgICAgICAg IHRoaXMuX21lc3NhZ2VzLnB1c2gobWVzc2FnZSk7CisKICAgICAgICAgaWYgKHRoaXMuX3VybFRv TWVzc2FnZUNvdW50W21lc3NhZ2UudXJsXSkKICAgICAgICAgICAgIHRoaXMuX3VybFRvTWVzc2Fn ZUNvdW50W21lc3NhZ2UudXJsXSsrOwogICAgICAgICBlbHNlCkBAIC00MjQsNiArNDI3LDcgQEAg V2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCB0aGlzLl92aXNpYmxlTWVzc2FnZXMubGVuZ3RoOyArK2kpCiAgICAgICAgICAg ICB0aGlzLl92aXNpYmxlTWVzc2FnZXNbaV0ud2lsbEhpZGUoKTsKICAgICAgICAgdGhpcy5fdmlz aWJsZU1lc3NhZ2VzID0gW107CisgICAgICAgIHRoaXMuX21lc3NhZ2VzID0gW107CiAKICAgICAg ICAgdGhpcy5jdXJyZW50R3JvdXAgPSB0aGlzLnRvcEdyb3VwOwogICAgICAgICB0aGlzLnRvcEdy b3VwLm1lc3NhZ2VzRWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOwpAQCAtNTI3LDcgKzUzMSw4IEBA IFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgX3No b3VsZEJlVmlzaWJsZTogZnVuY3Rpb24obWVzc2FnZSkKICAgICB7Ci0gICAgICAgIHJldHVybiAh bWVzc2FnZS51cmwgfHwgIXRoaXMuX21lc3NhZ2VVUkxGaWx0ZXJzW21lc3NhZ2UudXJsXTsKKyAg ICAgICAgcmV0dXJuIChtZXNzYWdlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5NZXNzYWdlVHlwZS5TdGFydEdyb3VwIHx8IG1lc3NhZ2UudHlwZSA9PT0gV2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlN0YXJ0R3JvdXBDb2xsYXBzZWQgfHwgbWVzc2Fn ZS50eXBlID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuRW5kR3Jv dXApIHx8CisgICAgICAgICAgICAoIW1lc3NhZ2UudXJsIHx8ICF0aGlzLl9tZXNzYWdlVVJMRmls dGVyc1ttZXNzYWdlLnVybF0pOwogICAgIH0sCiAKICAgICAvKioKQEAgLTUzNSwyNSArNTQwLDM1 IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAg X3VwZGF0ZU1lc3NhZ2VMaXN0OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB2YXIgc291cmNl TWVzc2FnZXMgPSBXZWJJbnNwZWN0b3IuY29uc29sZS5tZXNzYWdlczsKKyAgICAgICAgdmFyIGdy b3VwID0gdGhpcy50b3BHcm91cDsKKyAgICAgICAgdmFyIHNvdXJjZU1lc3NhZ2VzID0gdGhpcy5f bWVzc2FnZXM7CiAgICAgICAgIHZhciB2aXNpYmxlTWVzc2FnZUluZGV4ID0gMDsKICAgICAgICAg dmFyIG5ld1Zpc2libGVNZXNzYWdlcyA9IFtdOworICAgICAgICB2YXIgYW5jaG9yID0gbnVsbDsK ICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzb3VyY2VNZXNzYWdlcy5sZW5ndGg7IGkrKykg ewogICAgICAgICAgICAgdmFyIHNvdXJjZU1lc3NhZ2UgPSBzb3VyY2VNZXNzYWdlc1tpXTsKICAg ICAgICAgICAgIHZhciB2aXNpYmxlTWVzc2FnZSA9IHRoaXMuX3Zpc2libGVNZXNzYWdlc1t2aXNp YmxlTWVzc2FnZUluZGV4XTsKIAogICAgICAgICAgICAgaWYgKHZpc2libGVNZXNzYWdlID09PSBz b3VyY2VNZXNzYWdlKSB7CiAgICAgICAgICAgICAgICAgdmlzaWJsZU1lc3NhZ2VJbmRleCsrOwot ICAgICAgICAgICAgICAgIGlmICh0aGlzLl9zaG91bGRCZVZpc2libGUodmlzaWJsZU1lc3NhZ2Up KQorICAgICAgICAgICAgICAgIGlmICh0aGlzLl9zaG91bGRCZVZpc2libGUodmlzaWJsZU1lc3Nh Z2UpKSB7CiAgICAgICAgICAgICAgICAgICAgIG5ld1Zpc2libGVNZXNzYWdlcy5wdXNoKHZpc2li bGVNZXNzYWdlKTsKLSAgICAgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAg aWYgKHNvdXJjZU1lc3NhZ2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1l c3NhZ2VUeXBlLkVuZEdyb3VwKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBhbmNob3IgPSBn cm91cC5lbGVtZW50OworICAgICAgICAgICAgICAgICAgICAgICAgZ3JvdXAgPSBncm91cC5wYXJl bnRHcm91cCB8fCBncm91cDsKKyAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChzb3VyY2VN ZXNzYWdlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5T dGFydEdyb3VwIHx8IHNvdXJjZU1lc3NhZ2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VUeXBlLlN0YXJ0R3JvdXBDb2xsYXBzZWQpIHsKKyAgICAgICAgICAgICAg ICAgICAgICAgIGdyb3VwID0gc291cmNlTWVzc2FnZS5ncm91cDsKKyAgICAgICAgICAgICAgICAg ICAgICAgIGFuY2hvciA9IGdyb3VwLm1lc3NhZ2VzRWxlbWVudC5maXJzdENoaWxkOworICAgICAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAg ICAgICAgdmlzaWJsZU1lc3NhZ2Uud2lsbEhpZGUoKTsKLSAgICAgICAgICAgICAgICAgICAgdmlz aWJsZU1lc3NhZ2UudG9NZXNzYWdlRWxlbWVudCgpLnJlbW92ZVNlbGYoKTsgICAgICAgICAgICAg ICAgICAgIAorICAgICAgICAgICAgICAgICAgICB2aXNpYmxlTWVzc2FnZS50b01lc3NhZ2VFbGVt ZW50KCkucmVtb3ZlU2VsZigpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gZWxz ZSB7CiAgICAgICAgICAgICAgICAgaWYgKHRoaXMuX3Nob3VsZEJlVmlzaWJsZShzb3VyY2VNZXNz YWdlKSkgewotICAgICAgICAgICAgICAgICAgICB0aGlzLmN1cnJlbnRHcm91cC5hZGRNZXNzYWdl KHNvdXJjZU1lc3NhZ2UsIHZpc2libGVNZXNzYWdlID8gdmlzaWJsZU1lc3NhZ2UudG9NZXNzYWdl RWxlbWVudCgpIDogbnVsbCk7CisgICAgICAgICAgICAgICAgICAgIGdyb3VwLmFkZE1lc3NhZ2Uo c291cmNlTWVzc2FnZSwgYW5jaG9yID8gYW5jaG9yLm5leHRTaWJsaW5nIDogZ3JvdXAubWVzc2Fn ZXNFbGVtZW50LmZpcnN0Q2hpbGQpOwogICAgICAgICAgICAgICAgICAgICBuZXdWaXNpYmxlTWVz c2FnZXMucHVzaChzb3VyY2VNZXNzYWdlKTsKKyAgICAgICAgICAgICAgICAgICAgYW5jaG9yID0g c291cmNlTWVzc2FnZS50b01lc3NhZ2VFbGVtZW50KCk7CiAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgfQogICAgICAgICB9CkBAIC02NTQsOCArNjY5LDkgQEAgV2ViSW5zcGVjdG9yLkNv bnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGlmICghcmVzdWx0KQogICAg ICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHRoaXMuX2FwcGVuZENvbnNvbGVNZXNzYWdlKG5l dyBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmRSZXN1bHQocmVzdWx0LCB3YXNUaHJvd24sIG9y aWdpbmF0aW5nQ29tbWFuZCwgdGhpcy5fbGlua2lmaWVyKSk7CisgICAgICAgIHZhciBtZXNzYWdl ID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFJlc3VsdChyZXN1bHQsIHdhc1Rocm93 biwgb3JpZ2luYXRpbmdDb21tYW5kLCB0aGlzLl9saW5raWZpZXIpOworICAgICAgICB0aGlzLl9t ZXNzYWdlcy5wdXNoKG1lc3NhZ2UpOworICAgICAgICB0aGlzLl9hcHBlbmRDb25zb2xlTWVzc2Fn ZShtZXNzYWdlKTsKICAgICB9LAogCiAgICAgX2FwcGVuZENvbW1hbmQ6IGZ1bmN0aW9uKHRleHQs IG5ld1Byb21wdFRleHQsIHVzZUNvbW1hbmRMaW5lQVBJLCBzaG93UmVzdWx0T25seSkKQEAgLTY2 Myw2ICs2NzksNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAg ICAgICBpZiAoIXNob3dSZXN1bHRPbmx5KSB7CiAgICAgICAgICAgICB2YXIgY29tbWFuZE1lc3Nh Z2UgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kKHRleHQpOwogICAgICAgICAgICAg V2ViSW5zcGVjdG9yLmNvbnNvbGUuaW50ZXJydXB0UmVwZWF0Q291bnQoKTsKKyAgICAgICAgICAg IHRoaXMuX21lc3NhZ2VzLnB1c2goY29tbWFuZE1lc3NhZ2UpOwogICAgICAgICAgICAgdGhpcy5f YXBwZW5kQ29uc29sZU1lc3NhZ2UoY29tbWFuZE1lc3NhZ2UpOwogICAgICAgICB9CiAgICAgICAg IHRoaXMucHJvbXB0LnRleHQgPSBuZXdQcm9tcHRUZXh0OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDM3Y2RlNjdjYzM4Y2Zl ZjM2NWMzNjc5YmM4ZGQ0NzQ0YTRiZGIxZTguLmVmZDEwM2FiMmRmZmY0NWMxMzI2NTEzMzJmODY2 YzMxYjQ3NDJkZDAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMy0wMy0yNiAgRG1pdHJ5IFp2 b3J5Z2luICA8enZvcnlnaW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IEV4Y2VwdGlvbiBpbiBjb25zb2xlIG9uIGF0dGVtcHQgdG8gZmlsdGVyIGphdmFzY3JpcHQgbWVz c2FnZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTMzMjcKKworICAgICAgICBGaXhlZCBUWVBPIGluIHRlc3QuCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvY29uc29sZS9jb25zb2xl LXByZXNlcnZlLWxvZy5odG1sOgorCiAyMDEzLTAzLTI2ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBh dmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogW0VsZW1lbnRzXSBV bmFibGUgdG8gIkVkaXQgYXMgSFRNTCIgWEhUTUwvU1ZHIGRvY3VtZW50cy4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtcHJlc2VydmUtbG9nLmh0bWwg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXByZXNlcnZlLWxvZy5odG1s CmluZGV4IDUxNDc5OTkzYjk5NTVmZGJiZmVhNWMxZTJmYzAwOWNhZWZiNjkzOGQuLjRlZjlhMzNj ODA4MmU4NmM4ODZmMTcxODM1NDI5OWE2ZGUyNzI4MmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtcHJlc2VydmUtbG9nLmh0bWwKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1wcmVzZXJ2ZS1sb2cuaHRtbApAQCAtNSw3 ICs1LDcgQEAKIDxzY3JpcHQ+CiBmdW5jdGlvbiB0ZXN0KCkKIHsKLSAgICBXZWJJbnNwZWN0b3Iu Y29uc29sZS5hZGRNZXNzYWdlKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5jcmVhdGUoV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UuT3RoZXIsIFdlYkluc3BlY3Rv ci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwsICJQQVNTIikpOworICAgIFdlYkluc3BlY3Rv ci5jb25zb2xlLmFkZE1lc3NhZ2UoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLmNyZWF0ZShX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5PdGhlciwgV2ViSW5zcGVj dG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5Mb2csICJQQVNTIikpOwogICAgIFdlYklu c3BlY3Rvci5zZXR0aW5ncy5wcmVzZXJ2ZUNvbnNvbGVMb2cuc2V0KHRydWUpOwogICAgIEluc3Bl Y3RvclRlc3QucmVsb2FkUGFnZShmdW5jdGlvbigpIHsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5k dW1wQ29uc29sZU1lc3NhZ2VzKCk7Cg== 195315 2013-03-27 07:28:07 -0700 2013-04-01 07:24:31 -0700 Patch bug-113327-20130327182806.patch text/plain 20371 zvorygin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2OTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQyNzUwOTM3Zjg3ZTI4 NDQyZGZhODViZjE2MjkxNDNlMTYxOWM1MC4uZmIxNGZiNmYzODNkYmFmYjAxOWJhMzQzNDVjMzky NDgwOTRjMDk1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTAzLTI3ICBEbWl0 cnkgWnZvcnlnaW4gIDx6dm9yeWdpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogRXhjZXB0aW9uIGluIGNvbnNvbGUgb24gYXR0ZW1wdCB0byBmaWx0ZXIgamF2YXNjcmlw dCBtZXNzYWdlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMzMyNworCisgICAgICAgIEZpeGVkIG5vbi1jc3MgZmlsdHJhdGlvbiBpZiBjb25zb2xl IG1lc3NhZ2UgZ3JvdXBzIGFyZSBwcmVzZW50LiBNZXNzYWdlIGdyb3VwcyBlbGVtZW50cyBhcmUg YWx3YXlzIHNob3duIGFuZCBhcmUKKyAgICAgICAgbmV2ZXIgZmlsdGVyZWQgb3V0LgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlTWVzc2FnZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xl TWVzc2FnZUltcGwucHJvdG90eXBlLnVwZGF0ZVJlcGVhdENvdW50KToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNv bnNvbGVWaWV3LmdldCB0aGlzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5w cm90b3R5cGUuX2NvbnNvbGVNZXNzYWdlQWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNv bnNvbGVWaWV3LnByb3RvdHlwZS5fYXBwZW5kQ29uc29sZU1lc3NhZ2UpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fY29uc29sZUNsZWFyZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fc2hvdWxkQmVWaXNpYmxlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuX3VwZGF0ZU1lc3Nh Z2VMaXN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuX3By aW50UmVzdWx0KToKKwogMjAxMy0wMy0yNiAgUGV0ZXIgUnliaW4gIDxwcnliaW5AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlZmFjdG9yIGNvZGUgZHVwbGljYXRpb246 IFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50LndyYXBQcm9wZXJ0eUFzRWxl bWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29u c29sZU1lc3NhZ2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNv bGVNZXNzYWdlLmpzCmluZGV4IDQ0NzM3MDE0NDgyNDY2YzU1ZDJjMmVhZjM3NDNkNTVkMGI2YTZl NzYuLjZiZGUzNDkyYmNjYWYxYTE4ODEzMjZlYTMyNWY3MGNkZmU0ZjMzMjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qcwpA QCAtNzc2LDYgKzc3Niw5IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZUltcGwucHJvdG90 eXBlID0gewogICAgIH0sCiAKICAgICB1cGRhdGVSZXBlYXRDb3VudDogZnVuY3Rpb24oKSB7Cisg ICAgICAgIGlmICghdGhpcy5fZWxlbWVudCkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAg ICBpZiAoIXRoaXMucmVwZWF0Q291bnRFbGVtZW50KSB7CiAgICAgICAgICAgICB0aGlzLnJlcGVh dENvdW50RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKICAgICAgICAg ICAgIHRoaXMucmVwZWF0Q291bnRFbGVtZW50LmNsYXNzTmFtZSA9ICJidWJibGUiOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKaW5kZXgg OTAwN2NjOTRhZjA5MjEzODJkNDc0NjFhNmJmNjU1YWJlZmMxYjE3Yy4uMzA3YTFkNjFkNzBhNmI0 N2EzZDEyZGMyMzMxYzRlNTIyZTEwY2E0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC0zOSw2ICszOSw3IEBAIFdlYkluc3Bl Y3Rvci5Db25zb2xlVmlldyA9IGZ1bmN0aW9uKGhpZGVDb250ZXh0U2VsZWN0b3IpCiAgICAgdGhp cy5lbGVtZW50LmlkID0gImNvbnNvbGUtdmlldyI7CiAgICAgdGhpcy5fbWVzc2FnZVVSTEZpbHRl cnMgPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MubWVzc2FnZVVSTEZpbHRlcnMuZ2V0KCk7CiAgICAg dGhpcy5fdmlzaWJsZU1lc3NhZ2VzID0gW107CisgICAgdGhpcy5fbWVzc2FnZXMgPSBbXTsKICAg ICB0aGlzLl91cmxUb01lc3NhZ2VDb3VudCA9IHt9OwogCiAgICAgdGhpcy5fY2xlYXJDb25zb2xl QnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJDbGVhciBjb25zb2xlIGxvZy4iKSwgImNsZWFyLXN0YXR1cy1iYXItaXRlbSIpOwpA QCAtMzg0LDYgKzM4NSw4IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgX2NvbnNvbGVNZXNzYWdlQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAg ICAgdmFyIG1lc3NhZ2UgPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZX0g Ki8gKGV2ZW50LmRhdGEpOworICAgICAgICB0aGlzLl9tZXNzYWdlcy5wdXNoKG1lc3NhZ2UpOwor CiAgICAgICAgIGlmICh0aGlzLl91cmxUb01lc3NhZ2VDb3VudFttZXNzYWdlLnVybF0pCiAgICAg ICAgICAgICB0aGlzLl91cmxUb01lc3NhZ2VDb3VudFttZXNzYWdlLnVybF0rKzsKICAgICAgICAg ZWxzZQpAQCAtNDExLDYgKzQxNCw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICAgICAgdmFyIGdyb3VwID0gbmV3IFdlYkluc3BlY3Rvci5Db25z b2xlR3JvdXAodGhpcy5jdXJyZW50R3JvdXApOwogICAgICAgICAgICAgICAgIHRoaXMuY3VycmVu dEdyb3VwLm1lc3NhZ2VzRWxlbWVudC5hcHBlbmRDaGlsZChncm91cC5lbGVtZW50KTsKICAgICAg ICAgICAgICAgICB0aGlzLmN1cnJlbnRHcm91cCA9IGdyb3VwOworICAgICAgICAgICAgICAgIG1l c3NhZ2UuZ3JvdXAgPSBncm91cDsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHRoaXMuY3Vy cmVudEdyb3VwLmFkZE1lc3NhZ2UobWVzc2FnZSk7CiAgICAgICAgIH0KQEAgLTQyNCw2ICs0Mjgs NyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHRoaXMuX3Zpc2libGVNZXNzYWdlcy5sZW5ndGg7ICsraSkKICAgICAg ICAgICAgIHRoaXMuX3Zpc2libGVNZXNzYWdlc1tpXS53aWxsSGlkZSgpOwogICAgICAgICB0aGlz Ll92aXNpYmxlTWVzc2FnZXMgPSBbXTsKKyAgICAgICAgdGhpcy5fbWVzc2FnZXMgPSBbXTsKIAog ICAgICAgICB0aGlzLmN1cnJlbnRHcm91cCA9IHRoaXMudG9wR3JvdXA7CiAgICAgICAgIHRoaXMu dG9wR3JvdXAubWVzc2FnZXNFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CkBAIC01MjcsNyArNTMy LDggQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAg ICBfc2hvdWxkQmVWaXNpYmxlOiBmdW5jdGlvbihtZXNzYWdlKQogICAgIHsKLSAgICAgICAgcmV0 dXJuICFtZXNzYWdlLnVybCB8fCAhdGhpcy5fbWVzc2FnZVVSTEZpbHRlcnNbbWVzc2FnZS51cmxd OworICAgICAgICByZXR1cm4gKG1lc3NhZ2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VUeXBlLlN0YXJ0R3JvdXAgfHwgbWVzc2FnZS50eXBlID09PSBXZWJJbnNw ZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuU3RhcnRHcm91cENvbGxhcHNlZCB8fCBt ZXNzYWdlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5F bmRHcm91cCkgfHwKKyAgICAgICAgICAgICghbWVzc2FnZS51cmwgfHwgIXRoaXMuX21lc3NhZ2VV UkxGaWx0ZXJzW21lc3NhZ2UudXJsXSk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtNTM1LDI1ICs1 NDEsMzUgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgKi8K ICAgICBfdXBkYXRlTWVzc2FnZUxpc3Q6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHZhciBz b3VyY2VNZXNzYWdlcyA9IFdlYkluc3BlY3Rvci5jb25zb2xlLm1lc3NhZ2VzOworICAgICAgICB2 YXIgZ3JvdXAgPSB0aGlzLnRvcEdyb3VwOworICAgICAgICB2YXIgc291cmNlTWVzc2FnZXMgPSB0 aGlzLl9tZXNzYWdlczsKICAgICAgICAgdmFyIHZpc2libGVNZXNzYWdlSW5kZXggPSAwOwogICAg ICAgICB2YXIgbmV3VmlzaWJsZU1lc3NhZ2VzID0gW107CisgICAgICAgIHZhciBhbmNob3IgPSBu dWxsOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHNvdXJjZU1lc3NhZ2VzLmxlbmd0aDsg aSsrKSB7CiAgICAgICAgICAgICB2YXIgc291cmNlTWVzc2FnZSA9IHNvdXJjZU1lc3NhZ2VzW2ld OwogICAgICAgICAgICAgdmFyIHZpc2libGVNZXNzYWdlID0gdGhpcy5fdmlzaWJsZU1lc3NhZ2Vz W3Zpc2libGVNZXNzYWdlSW5kZXhdOwogCiAgICAgICAgICAgICBpZiAodmlzaWJsZU1lc3NhZ2Ug PT09IHNvdXJjZU1lc3NhZ2UpIHsKICAgICAgICAgICAgICAgICB2aXNpYmxlTWVzc2FnZUluZGV4 Kys7Ci0gICAgICAgICAgICAgICAgaWYgKHRoaXMuX3Nob3VsZEJlVmlzaWJsZSh2aXNpYmxlTWVz c2FnZSkpCisgICAgICAgICAgICAgICAgaWYgKHRoaXMuX3Nob3VsZEJlVmlzaWJsZSh2aXNpYmxl TWVzc2FnZSkpIHsKICAgICAgICAgICAgICAgICAgICAgbmV3VmlzaWJsZU1lc3NhZ2VzLnB1c2go dmlzaWJsZU1lc3NhZ2UpOwotICAgICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAg ICAgICBpZiAoc291cmNlTWVzc2FnZS50eXBlID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2UuTWVzc2FnZVR5cGUuRW5kR3JvdXApIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGFuY2hv ciA9IGdyb3VwLmVsZW1lbnQ7CisgICAgICAgICAgICAgICAgICAgICAgICBncm91cCA9IGdyb3Vw LnBhcmVudEdyb3VwIHx8IGdyb3VwOworICAgICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKHNv dXJjZU1lc3NhZ2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VU eXBlLlN0YXJ0R3JvdXAgfHwgc291cmNlTWVzc2FnZS50eXBlID09PSBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuU3RhcnRHcm91cENvbGxhcHNlZCkgeworICAgICAgICAg ICAgICAgICAgICAgICAgZ3JvdXAgPSBzb3VyY2VNZXNzYWdlLmdyb3VwOworICAgICAgICAgICAg ICAgICAgICAgICAgYW5jaG9yID0gZ3JvdXAubWVzc2FnZXNFbGVtZW50LmZpcnN0Q2hpbGQ7Cisg ICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAg ICAgICAgICAgICB2aXNpYmxlTWVzc2FnZS53aWxsSGlkZSgpOwotICAgICAgICAgICAgICAgICAg ICB2aXNpYmxlTWVzc2FnZS50b01lc3NhZ2VFbGVtZW50KCkucmVtb3ZlU2VsZigpOyAgICAgICAg ICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgICAgIHZpc2libGVNZXNzYWdlLnRvTWVzc2Fn ZUVsZW1lbnQoKS5yZW1vdmVTZWxmKCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgICAgICBpZiAodGhpcy5fc2hvdWxkQmVWaXNpYmxlKHNvdXJj ZU1lc3NhZ2UpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHRoaXMuY3VycmVudEdyb3VwLmFkZE1l c3NhZ2Uoc291cmNlTWVzc2FnZSwgdmlzaWJsZU1lc3NhZ2UgPyB2aXNpYmxlTWVzc2FnZS50b01l c3NhZ2VFbGVtZW50KCkgOiBudWxsKTsKKyAgICAgICAgICAgICAgICAgICAgZ3JvdXAuYWRkTWVz c2FnZShzb3VyY2VNZXNzYWdlLCBhbmNob3IgPyBhbmNob3IubmV4dFNpYmxpbmcgOiBncm91cC5t ZXNzYWdlc0VsZW1lbnQuZmlyc3RDaGlsZCk7CiAgICAgICAgICAgICAgICAgICAgIG5ld1Zpc2li bGVNZXNzYWdlcy5wdXNoKHNvdXJjZU1lc3NhZ2UpOworICAgICAgICAgICAgICAgICAgICBhbmNo b3IgPSBzb3VyY2VNZXNzYWdlLnRvTWVzc2FnZUVsZW1lbnQoKTsKICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTY1NCw4ICs2NzAsOSBAQCBXZWJJbnNwZWN0 b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKCFyZXN1bHQp CiAgICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdGhpcy5fYXBwZW5kQ29uc29sZU1lc3Nh Z2UobmV3IFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFJlc3VsdChyZXN1bHQsIHdhc1Rocm93 biwgb3JpZ2luYXRpbmdDb21tYW5kLCB0aGlzLl9saW5raWZpZXIpKTsKKyAgICAgICAgdmFyIG1l c3NhZ2UgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kUmVzdWx0KHJlc3VsdCwgd2Fz VGhyb3duLCBvcmlnaW5hdGluZ0NvbW1hbmQsIHRoaXMuX2xpbmtpZmllcik7CisgICAgICAgIHRo aXMuX21lc3NhZ2VzLnB1c2gobWVzc2FnZSk7CisgICAgICAgIHRoaXMuX2FwcGVuZENvbnNvbGVN ZXNzYWdlKG1lc3NhZ2UpOwogICAgIH0sCiAKICAgICBfYXBwZW5kQ29tbWFuZDogZnVuY3Rpb24o dGV4dCwgbmV3UHJvbXB0VGV4dCwgdXNlQ29tbWFuZExpbmVBUEksIHNob3dSZXN1bHRPbmx5KQpA QCAtNjYzLDYgKzY4MCw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgICAgIGlmICghc2hvd1Jlc3VsdE9ubHkpIHsKICAgICAgICAgICAgIHZhciBjb21tYW5k TWVzc2FnZSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmQodGV4dCk7CiAgICAgICAg ICAgICBXZWJJbnNwZWN0b3IuY29uc29sZS5pbnRlcnJ1cHRSZXBlYXRDb3VudCgpOworICAgICAg ICAgICAgdGhpcy5fbWVzc2FnZXMucHVzaChjb21tYW5kTWVzc2FnZSk7CiAgICAgICAgICAgICB0 aGlzLl9hcHBlbmRDb25zb2xlTWVzc2FnZShjb21tYW5kTWVzc2FnZSk7CiAgICAgICAgIH0KICAg ICAgICAgdGhpcy5wcm9tcHQudGV4dCA9IG5ld1Byb21wdFRleHQ7CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzdjZGU2N2Nj MzhjZmVmMzY1YzM2NzliYzhkZDQ3NDRhNGJkYjFlOC4uYmRjNzBiMjkxYzYwODc4ZGIyZTdhYTQy MzJkNmJhZTA5ZTUwNzE4MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAzLTI3ICBEbWl0 cnkgWnZvcnlnaW4gIDx6dm9yeWdpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogRXhjZXB0aW9uIGluIGNvbnNvbGUgb24gYXR0ZW1wdCB0byBmaWx0ZXIgamF2YXNjcmlw dCBtZXNzYWdlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMzMyNworCisgICAgICAgIEFkZGVkIGNvbnNvbGUgZ3JvdXBzIHRvIGNvbnNvbGUgZmls dGVyIHRlc3QuIEZpeGVkIG1pbm9yIGJ1Z3MgaW4gb3RoZXIgdGVzdHMuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvY29uc29sZS9j b25zb2xlLWZpbHRlci10ZXN0LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvY29u c29sZS9jb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2NvbnNv bGUvY29uc29sZS1wcmVzZXJ2ZS1sb2cuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvY29uc29s ZS9jb25zb2xlLXRlc3RzLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvY29uc29s ZS9jb25zb2xlLXRlc3RzLmh0bWw6CisKIDIwMTMtMDMtMjYgIEFsZXhhbmRlciBQYXZsb3YgIDxh cGF2bG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbRWxlbWVudHNd IFVuYWJsZSB0byAiRWRpdCBhcyBIVE1MIiBYSFRNTC9TVkcgZG9jdW1lbnRzLgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1maWx0ZXItdGVzdC1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLWZpbHRlci10 ZXN0LWV4cGVjdGVkLnR4dAppbmRleCBmYjZkOGM5YjRmMDlhNDhlNmIzMGE4OWU2NjU3N2IwOTY1 ZGVkODM5Li41NzJhNjM5ZGJiNmJhMjIwZTA5MjUxNTNlZjJjYWRlNWZhZmFkZTcwIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLWZpbHRlci10ZXN0LWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLWZp bHRlci10ZXN0LWV4cGVjdGVkLnR4dApAQCAtMSw2MCArMSwxNTIgQEAKLUNPTlNPTEUgTUVTU0FH RTogbGluZSA5OiAwCi1DT05TT0xFIE1FU1NBR0U6IGxpbmUgMzogMQotQ09OU09MRSBNRVNTQUdF OiBsaW5lIDk6IDIKLUNPTlNPTEUgTUVTU0FHRTogbGluZSAzOiAzCi1DT05TT0xFIE1FU1NBR0U6 IGxpbmUgOTogNAotQ09OU09MRSBNRVNTQUdFOiBsaW5lIDM6IDUKLUNPTlNPTEUgTUVTU0FHRTog bGluZSA5OiA2Ci1DT05TT0xFIE1FU1NBR0U6IGxpbmUgMzogNwotQ09OU09MRSBNRVNTQUdFOiBs aW5lIDk6IDgKLUNPTlNPTEUgTUVTU0FHRTogbGluZSAzOiA5Ci1DT05TT0xFIE1FU1NBR0U6IGxp bmUgMjI6IDEwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTogMHRvcEdyb3VwCitDT05TT0xFIE1F U1NBR0U6IGxpbmUgMzogMXRvcEdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTogMnRvcEdy b3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzogM3RvcEdyb3VwCitDT05TT0xFIE1FU1NBR0U6 IGxpbmUgOTogNHRvcEdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzogNXRvcEdyb3VwCitD T05TT0xFIE1FU1NBR0U6IGxpbmUgOTogNnRvcEdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUg MzogN3RvcEdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTogOHRvcEdyb3VwCitDT05TT0xF IE1FU1NBR0U6IGxpbmUgMzogOXRvcEdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTogMTBv dXRlckdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzogMTFvdXRlckdyb3VwCitDT05TT0xF IE1FU1NBR0U6IGxpbmUgOTogMTJvdXRlckdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzog MTNvdXRlckdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTogMTRvdXRlckdyb3VwCitDT05T T0xFIE1FU1NBR0U6IGxpbmUgMzogMTVvdXRlckdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUg OTogMTZvdXRlckdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzogMTdvdXRlckdyb3VwCitD T05TT0xFIE1FU1NBR0U6IGxpbmUgOTogMThvdXRlckdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxp bmUgMzogMTlvdXRlckdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTogMjBpbm5lckdyb3Vw CitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzogMjFpbm5lckdyb3VwCitDT05TT0xFIE1FU1NBR0U6 IGxpbmUgOTogMjJpbm5lckdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzogMjNpbm5lckdy b3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTogMjRpbm5lckdyb3VwCitDT05TT0xFIE1FU1NB R0U6IGxpbmUgMzogMjVpbm5lckdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTogMjZpbm5l ckdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzogMjdpbm5lckdyb3VwCitDT05TT0xFIE1F U1NBR0U6IGxpbmUgOTogMjhpbm5lckdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzogMjlp bm5lckdyb3VwCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzk6IGVuZAogVGVzdHMgdGhhdCBjb25z b2xlIGNhbiBmaWx0ZXIgbWVzc2FnZXMgYnkgc291cmNlLgogCiAKIFJ1bm5pbmc6IGJlZm9yZUZp bHRlcgogYmVmb3JlRmlsdGVyCi0wIGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5Ci0xIGxvZy1z b3VyY2UuanM6MwotMiBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6OQotMyBsb2ctc291cmNlLmpz OjMKLTQgY29uc29sZS1maWx0ZXItdGVzdC5odG1sOjkKLTUgbG9nLXNvdXJjZS5qczozCi02IGNv bnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5Ci03IGxvZy1zb3VyY2UuanM6MwotOCBjb25zb2xlLWZp bHRlci10ZXN0Lmh0bWw6OQotOSBsb2ctc291cmNlLmpzOjMKLTEwIGNvbnNvbGUtZmlsdGVyLXRl c3QuaHRtbDoyMgorMHRvcEdyb3VwIGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5CisxdG9wR3Jv dXAgbG9nLXNvdXJjZS5qczozCisydG9wR3JvdXAgY29uc29sZS1maWx0ZXItdGVzdC5odG1sOjkK KzN0b3BHcm91cCBsb2ctc291cmNlLmpzOjMKKzR0b3BHcm91cCBjb25zb2xlLWZpbHRlci10ZXN0 Lmh0bWw6OQorNXRvcEdyb3VwIGxvZy1zb3VyY2UuanM6MworNnRvcEdyb3VwIGNvbnNvbGUtZmls dGVyLXRlc3QuaHRtbDo5Cis3dG9wR3JvdXAgbG9nLXNvdXJjZS5qczozCis4dG9wR3JvdXAgY29u c29sZS1maWx0ZXItdGVzdC5odG1sOjkKKzl0b3BHcm91cCBsb2ctc291cmNlLmpzOjMKKz5vdXRl ckdyb3VwIGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDoyMgorICAxMG91dGVyR3JvdXAgY29uc29s ZS1maWx0ZXItdGVzdC5odG1sOjkKKyAgMTFvdXRlckdyb3VwIGxvZy1zb3VyY2UuanM6MworICAx Mm91dGVyR3JvdXAgY29uc29sZS1maWx0ZXItdGVzdC5odG1sOjkKKyAgMTNvdXRlckdyb3VwIGxv Zy1zb3VyY2UuanM6MworICAxNG91dGVyR3JvdXAgY29uc29sZS1maWx0ZXItdGVzdC5odG1sOjkK KyAgMTVvdXRlckdyb3VwIGxvZy1zb3VyY2UuanM6MworICAxNm91dGVyR3JvdXAgY29uc29sZS1m aWx0ZXItdGVzdC5odG1sOjkKKyAgMTdvdXRlckdyb3VwIGxvZy1zb3VyY2UuanM6MworICAxOG91 dGVyR3JvdXAgY29uc29sZS1maWx0ZXItdGVzdC5odG1sOjkKKyAgMTlvdXRlckdyb3VwIGxvZy1z b3VyY2UuanM6MworICA+aW5uZXJHcm91cCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6MjkKKyAg ICAyMGlubmVyR3JvdXAgY29uc29sZS1maWx0ZXItdGVzdC5odG1sOjkKKyAgICAyMWlubmVyR3Jv dXAgbG9nLXNvdXJjZS5qczozCisgICAgMjJpbm5lckdyb3VwIGNvbnNvbGUtZmlsdGVyLXRlc3Qu aHRtbDo5CisgICAgMjNpbm5lckdyb3VwIGxvZy1zb3VyY2UuanM6MworICAgIDI0aW5uZXJHcm91 cCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6OQorICAgIDI1aW5uZXJHcm91cCBsb2ctc291cmNl LmpzOjMKKyAgICAyNmlubmVyR3JvdXAgY29uc29sZS1maWx0ZXItdGVzdC5odG1sOjkKKyAgICAy N2lubmVyR3JvdXAgbG9nLXNvdXJjZS5qczozCisgICAgMjhpbm5lckdyb3VwIGNvbnNvbGUtZmls dGVyLXRlc3QuaHRtbDo5CisgICAgMjlpbm5lckdyb3VwIGxvZy1zb3VyY2UuanM6MworZW5kIGNv bnNvbGUtZmlsdGVyLXRlc3QuaHRtbDozOQogCiBSdW5uaW5nOiBhZGRVUkwxRmlsdGVyCi0xIGxv Zy1zb3VyY2UuanM6MwotMyBsb2ctc291cmNlLmpzOjMKLTUgbG9nLXNvdXJjZS5qczozCi03IGxv Zy1zb3VyY2UuanM6MwotOSBsb2ctc291cmNlLmpzOjMKKzF0b3BHcm91cCBsb2ctc291cmNlLmpz OjMKKzN0b3BHcm91cCBsb2ctc291cmNlLmpzOjMKKzV0b3BHcm91cCBsb2ctc291cmNlLmpzOjMK Kzd0b3BHcm91cCBsb2ctc291cmNlLmpzOjMKKzl0b3BHcm91cCBsb2ctc291cmNlLmpzOjMKKz5v dXRlckdyb3VwIGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDoyMgorICAxMW91dGVyR3JvdXAgbG9n LXNvdXJjZS5qczozCisgIDEzb3V0ZXJHcm91cCBsb2ctc291cmNlLmpzOjMKKyAgMTVvdXRlckdy b3VwIGxvZy1zb3VyY2UuanM6MworICAxN291dGVyR3JvdXAgbG9nLXNvdXJjZS5qczozCisgIDE5 b3V0ZXJHcm91cCBsb2ctc291cmNlLmpzOjMKKyAgPmlubmVyR3JvdXAgY29uc29sZS1maWx0ZXIt dGVzdC5odG1sOjI5CisgICAgMjFpbm5lckdyb3VwIGxvZy1zb3VyY2UuanM6MworICAgIDIzaW5u ZXJHcm91cCBsb2ctc291cmNlLmpzOjMKKyAgICAyNWlubmVyR3JvdXAgbG9nLXNvdXJjZS5qczoz CisgICAgMjdpbm5lckdyb3VwIGxvZy1zb3VyY2UuanM6MworICAgIDI5aW5uZXJHcm91cCBsb2ct c291cmNlLmpzOjMKIAogUnVubmluZzogYWRkVVJMMkZpbHRlcgorPm91dGVyR3JvdXAgY29uc29s ZS1maWx0ZXItdGVzdC5odG1sOjIyCisgID5pbm5lckdyb3VwIGNvbnNvbGUtZmlsdGVyLXRlc3Qu aHRtbDoyOQogCiBSdW5uaW5nOiByZW1vdmVVUkwxRmlsdGVyCi0wIGNvbnNvbGUtZmlsdGVyLXRl c3QuaHRtbDo5Ci0yIGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5Ci00IGNvbnNvbGUtZmlsdGVy LXRlc3QuaHRtbDo5Ci02IGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5Ci04IGNvbnNvbGUtZmls dGVyLXRlc3QuaHRtbDo5Ci0xMCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6MjIKKzB0b3BHcm91 cCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6OQorMnRvcEdyb3VwIGNvbnNvbGUtZmlsdGVyLXRl c3QuaHRtbDo5Cis0dG9wR3JvdXAgY29uc29sZS1maWx0ZXItdGVzdC5odG1sOjkKKzZ0b3BHcm91 cCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6OQorOHRvcEdyb3VwIGNvbnNvbGUtZmlsdGVyLXRl c3QuaHRtbDo5Cis+b3V0ZXJHcm91cCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6MjIKKyAgPmlu bmVyR3JvdXAgY29uc29sZS1maWx0ZXItdGVzdC5odG1sOjI5CisgICAgMjBpbm5lckdyb3VwIGNv bnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5CisgICAgMjJpbm5lckdyb3VwIGNvbnNvbGUtZmlsdGVy LXRlc3QuaHRtbDo5CisgICAgMjRpbm5lckdyb3VwIGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5 CisgICAgMjZpbm5lckdyb3VwIGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5CisgICAgMjhpbm5l ckdyb3VwIGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5CisgIDEwb3V0ZXJHcm91cCBjb25zb2xl LWZpbHRlci10ZXN0Lmh0bWw6OQorICAxMm91dGVyR3JvdXAgY29uc29sZS1maWx0ZXItdGVzdC5o dG1sOjkKKyAgMTRvdXRlckdyb3VwIGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5CisgIDE2b3V0 ZXJHcm91cCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6OQorICAxOG91dGVyR3JvdXAgY29uc29s ZS1maWx0ZXItdGVzdC5odG1sOjkKK2VuZCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6MzkKIAog UnVubmluZzogcmVzdG9yZVVSTDFGaWx0ZXIKKz5vdXRlckdyb3VwIGNvbnNvbGUtZmlsdGVyLXRl c3QuaHRtbDoyMgorICA+aW5uZXJHcm91cCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6MjkKIAog UnVubmluZzogcmVtb3ZlQWxsRmlsdGVycwotMCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6OQot MSBsb2ctc291cmNlLmpzOjMKLTIgY29uc29sZS1maWx0ZXItdGVzdC5odG1sOjkKLTMgbG9nLXNv dXJjZS5qczozCi00IGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5Ci01IGxvZy1zb3VyY2UuanM6 MwotNiBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6OQotNyBsb2ctc291cmNlLmpzOjMKLTggY29u c29sZS1maWx0ZXItdGVzdC5odG1sOjkKLTkgbG9nLXNvdXJjZS5qczozCi0xMCBjb25zb2xlLWZp bHRlci10ZXN0Lmh0bWw6MjIKKzB0b3BHcm91cCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6OQor MXRvcEdyb3VwIGxvZy1zb3VyY2UuanM6MworMnRvcEdyb3VwIGNvbnNvbGUtZmlsdGVyLXRlc3Qu aHRtbDo5CiszdG9wR3JvdXAgbG9nLXNvdXJjZS5qczozCis0dG9wR3JvdXAgY29uc29sZS1maWx0 ZXItdGVzdC5odG1sOjkKKzV0b3BHcm91cCBsb2ctc291cmNlLmpzOjMKKzZ0b3BHcm91cCBjb25z b2xlLWZpbHRlci10ZXN0Lmh0bWw6OQorN3RvcEdyb3VwIGxvZy1zb3VyY2UuanM6MworOHRvcEdy b3VwIGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5Cis5dG9wR3JvdXAgbG9nLXNvdXJjZS5qczoz Cis+b3V0ZXJHcm91cCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6MjIKKyAgPmlubmVyR3JvdXAg Y29uc29sZS1maWx0ZXItdGVzdC5odG1sOjI5CisgICAgMjBpbm5lckdyb3VwIGNvbnNvbGUtZmls dGVyLXRlc3QuaHRtbDo5CisgICAgMjFpbm5lckdyb3VwIGxvZy1zb3VyY2UuanM6MworICAgIDIy aW5uZXJHcm91cCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6OQorICAgIDIzaW5uZXJHcm91cCBs b2ctc291cmNlLmpzOjMKKyAgICAyNGlubmVyR3JvdXAgY29uc29sZS1maWx0ZXItdGVzdC5odG1s OjkKKyAgICAyNWlubmVyR3JvdXAgbG9nLXNvdXJjZS5qczozCisgICAgMjZpbm5lckdyb3VwIGNv bnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5CisgICAgMjdpbm5lckdyb3VwIGxvZy1zb3VyY2UuanM6 MworICAgIDI4aW5uZXJHcm91cCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6OQorICAgIDI5aW5u ZXJHcm91cCBsb2ctc291cmNlLmpzOjMKKyAgMTBvdXRlckdyb3VwIGNvbnNvbGUtZmlsdGVyLXRl c3QuaHRtbDo5CisgIDExb3V0ZXJHcm91cCBsb2ctc291cmNlLmpzOjMKKyAgMTJvdXRlckdyb3Vw IGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5CisgIDEzb3V0ZXJHcm91cCBsb2ctc291cmNlLmpz OjMKKyAgMTRvdXRlckdyb3VwIGNvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5CisgIDE1b3V0ZXJH cm91cCBsb2ctc291cmNlLmpzOjMKKyAgMTZvdXRlckdyb3VwIGNvbnNvbGUtZmlsdGVyLXRlc3Qu aHRtbDo5CisgIDE3b3V0ZXJHcm91cCBsb2ctc291cmNlLmpzOjMKKyAgMThvdXRlckdyb3VwIGNv bnNvbGUtZmlsdGVyLXRlc3QuaHRtbDo5CisgIDE5b3V0ZXJHcm91cCBsb2ctc291cmNlLmpzOjMK K2VuZCBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWw6MzkKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1maWx0ZXItdGVzdC5odG1sIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1maWx0ZXItdGVzdC5odG1sCmluZGV4IDZhZmVk MWExODhiY2U5ODBmYzE2OGYyMmUxOTlhZDliNjRjM2JjN2QuLmE5ZjY4MmY4Zjk3MDRlMzNiNGVi YmYyYzEyMzFiNDJkNTg1ZmExYzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9j b25zb2xlL2NvbnNvbGUtZmlsdGVyLXRlc3QuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvY29uc29sZS9jb25zb2xlLWZpbHRlci10ZXN0Lmh0bWwKQEAgLTE0LDEyICsxNCwyOSBAQCBm dW5jdGlvbiBvbmxvYWQoKQogewogICAgIGZvciAodmFyIGkgPSAwOyBpIDwgMTA7IGkrKykgewog ICAgICAgICBpZiAoaSAlIDIgPT0gMCkKLSAgICAgICAgICAgIGxvZzEoaSk7IC8vIGZyb20gY29u c29sZS1maWx0ZXItdGVzdC5odG1sCisgICAgICAgICAgICBsb2cxKGkgKyAidG9wR3JvdXAiKTsg Ly8gZnJvbSBjb25zb2xlLWZpbHRlci10ZXN0Lmh0bWwKICAgICAgICAgZWxzZQotICAgICAgICAg ICAgbG9nMihpKTsgLy8gZnJvbSBsb2ctc291cmNlLmpzCisgICAgICAgICAgICBsb2cyKGkgKyAi dG9wR3JvdXAiKTsgLy8gZnJvbSBsb2ctc291cmNlLmpzCiAgICAgfQogCi0gICAgY29uc29sZS5s b2coMTApOworICAgIGNvbnNvbGUuZ3JvdXAoIm91dGVyR3JvdXAiKTsKKyAgICBmb3IgKHZhciBp ID0gMTA7IGkgPCAyMDsgaSsrKSB7CisgICAgICAgIGlmIChpICUgMiA9PSAwKQorICAgICAgICAg ICAgbG9nMShpICsgIm91dGVyR3JvdXAiKTsgLy8gZnJvbSBjb25zb2xlLWZpbHRlci10ZXN0Lmh0 bWwKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbG9nMihpICsgIm91dGVyR3JvdXAiKTsgLy8g ZnJvbSBsb2ctc291cmNlLmpzCisgICAgfQorICAgIGNvbnNvbGUuZ3JvdXAoImlubmVyR3JvdXAi KTsKKyAgICBmb3IgKHZhciBpID0gMjA7IGkgPCAzMDsgaSsrKSB7CisgICAgICAgIGlmIChpICUg MiA9PSAwKQorICAgICAgICAgICAgbG9nMShpICsgImlubmVyR3JvdXAiKTsgLy8gZnJvbSBjb25z b2xlLWZpbHRlci10ZXN0Lmh0bWwKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbG9nMihpICsg ImlubmVyR3JvdXAiKTsgLy8gZnJvbSBsb2ctc291cmNlLmpzCisgICAgfQorICAgIGNvbnNvbGUu Z3JvdXBFbmQoKTsKKyAgICBjb25zb2xlLmdyb3VwRW5kKCk7CisKKyAgICBjb25zb2xlLmxvZygi ZW5kIik7CiAKICAgICBydW5UZXN0KCk7CiB9CkBAIC0yNywxNiArNDQsMzIgQEAgZnVuY3Rpb24g b25sb2FkKCkKIGZ1bmN0aW9uIHRlc3QoKQogewogICAgIHZhciBtZXNzYWdlc0VsZW1lbnQgPSBX ZWJJbnNwZWN0b3IuY29uc29sZVZpZXcubWVzc2FnZXNFbGVtZW50OwotICAgIHZhciBncm91cE1l c3NhZ2VzID0gbWVzc2FnZXNFbGVtZW50LnF1ZXJ5U2VsZWN0b3IoIi5jb25zb2xlLWdyb3VwLW1l c3NhZ2VzIik7CiAKLSAgICBmdW5jdGlvbiBkdW1wVmlzaWJsZU1lc3NhZ2VzKCkKKyAgICBmdW5j dGlvbiBkdW1wVmlzaWJsZU1lc3NhZ2VzKHJvb3QsIGluZGVudCkKICAgICB7Ci0gICAgICAgIHZh ciBjaGlsZHJlbiA9IGdyb3VwTWVzc2FnZXMuY2hpbGROb2RlczsKKyAgICAgICAgaW5kZW50ID0g aW5kZW50IHx8ICIiOworICAgICAgICByb290ID0gcm9vdCB8fCBXZWJJbnNwZWN0b3IuY29uc29s ZVZpZXcubWVzc2FnZXNFbGVtZW50LmZpcnN0Q2hpbGQ7IC8vIC5jb25zb2xlLWdyb3VwCisgICAg ICAgIHZhciBjaGlsZHJlbiA9IHJvb3QuY2hpbGROb2RlczsKIAotICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IGNoaWxkcmVuLmxlbmd0aDsgaSsrKQotICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hZGRSZXN1bHQoY2hpbGRyZW5baV0udGV4dENvbnRlbnQpOworICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IGNoaWxkcmVuLmxlbmd0aDsgaSsrKSB7CisgICAgICAgICAgICBpZiAoY2hpbGRy ZW5baV0uaGFzU3R5bGVDbGFzcygiY29uc29sZS1tZXNzYWdlIikpIHsKKyAgICAgICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChpbmRlbnQgKyAiPiIgKyBjaGlsZHJlbltpXS50ZXh0 Q29udGVudCk7CisgICAgICAgICAgICAgICAgaW5kZW50ID0gaW5kZW50ICsgIiAgIjsKKyAgICAg ICAgICAgIH0gZWxzZSBpZiAoY2hpbGRyZW5baV0uaGFzU3R5bGVDbGFzcygiY29uc29sZS1ncm91 cC1tZXNzYWdlcyIpKSB7CisgICAgICAgICAgICAgICAgdmFyIGdyb3VwTWVzc2FnZXMgPSBjaGls ZHJlbltpXS5jaGlsZE5vZGVzOworICAgICAgICAgICAgICAgIGZvciAodmFyIGogPSAwOyBqIDwg Z3JvdXBNZXNzYWdlcy5sZW5ndGg7IGorKykgeworICAgICAgICAgICAgICAgICAgICBpZiAoZ3Jv dXBNZXNzYWdlc1tqXS5oYXNTdHlsZUNsYXNzKCJjb25zb2xlLW1lc3NhZ2UiKSkgeworICAgICAg ICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoaW5kZW50ICsgZ3JvdXBN ZXNzYWdlc1tqXS50ZXh0Q29udGVudCk7CisgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAo Z3JvdXBNZXNzYWdlc1tqXS5oYXNTdHlsZUNsYXNzKCJjb25zb2xlLWdyb3VwIikpIHsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGR1bXBWaXNpYmxlTWVzc2FnZXMoZ3JvdXBNZXNzYWdlc1tqXSwg aW5kZW50KTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0KKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQogICAgIH0KIAorICAgIHZhciBncm91cE1lc3NhZ2VzID0gbWVz c2FnZXNFbGVtZW50LnF1ZXJ5U2VsZWN0b3IoIi5jb25zb2xlLWdyb3VwLW1lc3NhZ2VzIik7CisK ICAgICB2YXIgdXJsMSA9IGdyb3VwTWVzc2FnZXMuY2hpbGROb2Rlc1swXS5tZXNzYWdlLnVybDsK ICAgICB2YXIgdXJsMiA9IGdyb3VwTWVzc2FnZXMuY2hpbGROb2Rlc1sxXS5tZXNzYWdlLnVybDsK IApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1wcmVz ZXJ2ZS1sb2cuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtcHJl c2VydmUtbG9nLmh0bWwKaW5kZXggNTE0Nzk5OTNiOTk1NWZkYmJmZWE1YzFlMmZjMDA5Y2FlZmI2 OTM4ZC4uNGVmOWEzM2M4MDgyZTg2Yzg4NmYxNzE4MzU0Mjk5YTZkZTI3MjgyYyAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS1wcmVzZXJ2ZS1sb2cuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXByZXNlcnZlLWxv Zy5odG1sCkBAIC01LDcgKzUsNyBAQAogPHNjcmlwdD4KIGZ1bmN0aW9uIHRlc3QoKQogewotICAg IFdlYkluc3BlY3Rvci5jb25zb2xlLmFkZE1lc3NhZ2UoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLmNyZWF0ZShXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5PdGhl ciwgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbCwgIlBBU1MiKSk7Cisg ICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuYWRkTWVzc2FnZShXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UuY3JlYXRlKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlU291cmNlLk90 aGVyLCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkxvZywgIlBBU1Mi KSk7CiAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnByZXNlcnZlQ29uc29sZUxvZy5zZXQodHJ1 ZSk7CiAgICAgSW5zcGVjdG9yVGVzdC5yZWxvYWRQYWdlKGZ1bmN0aW9uKCkgewogICAgICAgICBJ bnNwZWN0b3JUZXN0LmR1bXBDb25zb2xlTWVzc2FnZXMoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtdGVzdHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS10ZXN0cy1leHBlY3RlZC50eHQKaW5kZXgg MjkxYmU0Y2QyYTlkZTkwMWVlZTk4MDkyMWM3MDczZjI1ZjhiYTkyZS4uODc1MTFiNmE5ODI0MzZk MjA5NGFkOGYzZTkzOGRkYzIzMzIwNzQ1NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2NvbnNvbGUvY29uc29sZS10ZXN0cy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS10ZXN0cy1leHBlY3RlZC50eHQKQEAgLTQzLDQgKzQz LDUgQEAgZnVuY3Rpb24gKCkgeyB9IGNvbnNvbGUtdGVzdHMuaHRtbDoyOCBjb25zb2xlLW1lc3Nh Z2UgY29uc29sZS1sb2ctbGV2ZWwKIGZ1bmN0aW9uIGYoKSB7IH0gY29uc29sZS10ZXN0cy5odG1s OjI5IGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWxvZy1sZXZlbAogQXJyYXlbM10gY29uc29sZS10 ZXN0cy5odG1sOjMwIGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWxvZy1sZXZlbAogL3JlZ2V4cC4q LyBjb25zb2xlLXRlc3RzLmh0bWw6MzEgY29uc29sZS1tZXNzYWdlIGNvbnNvbGUtbG9nLWxldmVs CisgY29uc29sZS1tZXNzYWdlIGNvbnNvbGUtbG9nLWxldmVsCiAKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtdGVzdHMuaHRtbCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtdGVzdHMuaHRtbAppbmRleCAzNmFiYmQ2Zjg1N2U5 ZWExMWViYWY3MmY0YjFmZWUzNTQ2YjAzMzExLi5iMzkxMDJiMDAzYTYwYWE0NDNhYTc1OThlZjM4 YTk3ODY2ODQ3MWQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9j b25zb2xlLXRlc3RzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29u c29sZS10ZXN0cy5odG1sCkBAIC0yOSw2ICsyOSw3IEBAIGZ1bmN0aW9uIG9ubG9hZCgpCiAgICAg Y29uc29sZS5sb2coZnVuY3Rpb24gZigpIHsgfSk7CiAgICAgY29uc29sZS5sb2coWzEsIDIsIDNd KTsKICAgICBjb25zb2xlLmxvZygvcmVnZXhwLiovKTsKKyAgICBjb25zb2xlLmdyb3VwRW5kKCk7 CiAKICAgICBydW5UZXN0KCk7CiB9Cg== 195966 2013-04-01 07:24:37 -0700 2013-04-01 08:25:06 -0700 Patch bug-113327-20130401182430.patch text/plain 7506 zvorygin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGMzYTNkNmViY2JjOTBl ZGRiNTZmNjU5OWRkMjM4NTkwNTVlMzk5Zi4uNGEwMzY5YTEwNDc1NDNlMWY0NmYwMTRjYzQxOWVj NDYxYjRkMTA1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA0LTAxICBEbWl0 cnkgWnZvcnlnaW4gIDx6dm9yeWdpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogRXhjZXB0aW9uIGluIGNvbnNvbGUgb24gYXR0ZW1wdCB0byBmaWx0ZXIgamF2YXNjcmlw dCBtZXNzYWdlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMzMyNworCisgICAgICAgIEZpeGVkIG5vbi1jc3MgZmlsdHJhdGlvbiBpZiBjb25zb2xl IG1lc3NhZ2UgZ3JvdXBzIGFyZSBwcmVzZW50LiBNZXNzYWdlIGdyb3VwcyBlbGVtZW50cyBhcmUg YWx3YXlzIHNob3duIGFuZCBhcmUKKyAgICAgICAgbmV2ZXIgZmlsdGVyZWQgb3V0LgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlTWVzc2FnZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xl TWVzc2FnZUltcGwucHJvdG90eXBlLnVwZGF0ZVJlcGVhdENvdW50KToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNv bnNvbGVWaWV3LmdldCB0aGlzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5w cm90b3R5cGUuX2NvbnNvbGVNZXNzYWdlQWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNv bnNvbGVWaWV3LnByb3RvdHlwZS5fYXBwZW5kQ29uc29sZU1lc3NhZ2UpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fY29uc29sZUNsZWFyZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fc2hvdWxkQmVWaXNpYmxlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuX3VwZGF0ZU1lc3Nh Z2VMaXN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuX3By aW50UmVzdWx0KToKKwogMjAxMy0wMy0yOCAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxp YS5jb20+CiAKICAgICAgICAgW0dUS10gQnVpbGQgR1RLLXNwZWNpZmljLCBub24tbGF5ZXItdmlv bGF0aW5nIHNvdXJjZSBjb2RlIGludG8gV2ViQ29yZS1pbmRlcGVuZGVudCBsaWJQbGF0Zm9ybUd0 ay5sYQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25z b2xlTWVzc2FnZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29s ZU1lc3NhZ2UuanMKaW5kZXggNDQ3MzcwMTQ0ODI0NjZjNTVkMmMyZWFmMzc0M2Q1NWQwYjZhNmU3 Ni4uNmJkZTM0OTJiY2NhZjFhMTg4MTMyNmVhMzI1ZjcwY2RmZTRmMzMyNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzCkBA IC03NzYsNiArNzc2LDkgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5 cGUgPSB7CiAgICAgfSwKIAogICAgIHVwZGF0ZVJlcGVhdENvdW50OiBmdW5jdGlvbigpIHsKKyAg ICAgICAgaWYgKCF0aGlzLl9lbGVtZW50KQorICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAg IGlmICghdGhpcy5yZXBlYXRDb3VudEVsZW1lbnQpIHsKICAgICAgICAgICAgIHRoaXMucmVwZWF0 Q291bnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwogICAgICAgICAg ICAgdGhpcy5yZXBlYXRDb3VudEVsZW1lbnQuY2xhc3NOYW1lID0gImJ1YmJsZSI7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRleCA5 MDA3Y2M5NGFmMDkyMTM4MmQ0NzQ2MWE2YmY2NTVhYmVmYzFiMTdjLi4zMDdhMWQ2MWQ3MGE2YjQ3 YTNkMTJkYzIzMzFjNGU1MjJlMTBjYTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAgLTM5LDYgKzM5LDcgQEAgV2ViSW5zcGVj dG9yLkNvbnNvbGVWaWV3ID0gZnVuY3Rpb24oaGlkZUNvbnRleHRTZWxlY3RvcikKICAgICB0aGlz LmVsZW1lbnQuaWQgPSAiY29uc29sZS12aWV3IjsKICAgICB0aGlzLl9tZXNzYWdlVVJMRmlsdGVy cyA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5tZXNzYWdlVVJMRmlsdGVycy5nZXQoKTsKICAgICB0 aGlzLl92aXNpYmxlTWVzc2FnZXMgPSBbXTsKKyAgICB0aGlzLl9tZXNzYWdlcyA9IFtdOwogICAg IHRoaXMuX3VybFRvTWVzc2FnZUNvdW50ID0ge307CiAKICAgICB0aGlzLl9jbGVhckNvbnNvbGVC dXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkNsZWFyIGNvbnNvbGUgbG9nLiIpLCAiY2xlYXItc3RhdHVzLWJhci1pdGVtIik7CkBA IC0zODQsNiArMzg1LDggQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsK ICAgICBfY29uc29sZU1lc3NhZ2VBZGRlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAg ICB2YXIgbWVzc2FnZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlfSAq LyAoZXZlbnQuZGF0YSk7CisgICAgICAgIHRoaXMuX21lc3NhZ2VzLnB1c2gobWVzc2FnZSk7CisK ICAgICAgICAgaWYgKHRoaXMuX3VybFRvTWVzc2FnZUNvdW50W21lc3NhZ2UudXJsXSkKICAgICAg ICAgICAgIHRoaXMuX3VybFRvTWVzc2FnZUNvdW50W21lc3NhZ2UudXJsXSsrOwogICAgICAgICBl bHNlCkBAIC00MTEsNiArNDE0LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgICAgICB2YXIgZ3JvdXAgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNv bGVHcm91cCh0aGlzLmN1cnJlbnRHcm91cCk7CiAgICAgICAgICAgICAgICAgdGhpcy5jdXJyZW50 R3JvdXAubWVzc2FnZXNFbGVtZW50LmFwcGVuZENoaWxkKGdyb3VwLmVsZW1lbnQpOwogICAgICAg ICAgICAgICAgIHRoaXMuY3VycmVudEdyb3VwID0gZ3JvdXA7CisgICAgICAgICAgICAgICAgbWVz c2FnZS5ncm91cCA9IGdyb3VwOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgdGhpcy5jdXJy ZW50R3JvdXAuYWRkTWVzc2FnZShtZXNzYWdlKTsKICAgICAgICAgfQpAQCAtNDI0LDYgKzQyOCw3 IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgdGhpcy5fdmlzaWJsZU1lc3NhZ2VzLmxlbmd0aDsgKytpKQogICAgICAg ICAgICAgdGhpcy5fdmlzaWJsZU1lc3NhZ2VzW2ldLndpbGxIaWRlKCk7CiAgICAgICAgIHRoaXMu X3Zpc2libGVNZXNzYWdlcyA9IFtdOworICAgICAgICB0aGlzLl9tZXNzYWdlcyA9IFtdOwogCiAg ICAgICAgIHRoaXMuY3VycmVudEdyb3VwID0gdGhpcy50b3BHcm91cDsKICAgICAgICAgdGhpcy50 b3BHcm91cC5tZXNzYWdlc0VsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKQEAgLTUyNyw3ICs1MzIs OCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAqLwogICAg IF9zaG91bGRCZVZpc2libGU6IGZ1bmN0aW9uKG1lc3NhZ2UpCiAgICAgewotICAgICAgICByZXR1 cm4gIW1lc3NhZ2UudXJsIHx8ICF0aGlzLl9tZXNzYWdlVVJMRmlsdGVyc1ttZXNzYWdlLnVybF07 CisgICAgICAgIHJldHVybiAobWVzc2FnZS50eXBlID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UuTWVzc2FnZVR5cGUuU3RhcnRHcm91cCB8fCBtZXNzYWdlLnR5cGUgPT09IFdlYkluc3Bl Y3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5TdGFydEdyb3VwQ29sbGFwc2VkIHx8IG1l c3NhZ2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLkVu ZEdyb3VwKSB8fAorICAgICAgICAgICAgKCFtZXNzYWdlLnVybCB8fCAhdGhpcy5fbWVzc2FnZVVS TEZpbHRlcnNbbWVzc2FnZS51cmxdKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC01MzUsMjUgKzU0 MSwzNSBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAqLwog ICAgIF91cGRhdGVNZXNzYWdlTGlzdDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdmFyIHNv dXJjZU1lc3NhZ2VzID0gV2ViSW5zcGVjdG9yLmNvbnNvbGUubWVzc2FnZXM7CisgICAgICAgIHZh ciBncm91cCA9IHRoaXMudG9wR3JvdXA7CisgICAgICAgIHZhciBzb3VyY2VNZXNzYWdlcyA9IHRo aXMuX21lc3NhZ2VzOwogICAgICAgICB2YXIgdmlzaWJsZU1lc3NhZ2VJbmRleCA9IDA7CiAgICAg ICAgIHZhciBuZXdWaXNpYmxlTWVzc2FnZXMgPSBbXTsKKyAgICAgICAgdmFyIGFuY2hvciA9IG51 bGw7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc291cmNlTWVzc2FnZXMubGVuZ3RoOyBp KyspIHsKICAgICAgICAgICAgIHZhciBzb3VyY2VNZXNzYWdlID0gc291cmNlTWVzc2FnZXNbaV07 CiAgICAgICAgICAgICB2YXIgdmlzaWJsZU1lc3NhZ2UgPSB0aGlzLl92aXNpYmxlTWVzc2FnZXNb dmlzaWJsZU1lc3NhZ2VJbmRleF07CiAKICAgICAgICAgICAgIGlmICh2aXNpYmxlTWVzc2FnZSA9 PT0gc291cmNlTWVzc2FnZSkgewogICAgICAgICAgICAgICAgIHZpc2libGVNZXNzYWdlSW5kZXgr KzsKLSAgICAgICAgICAgICAgICBpZiAodGhpcy5fc2hvdWxkQmVWaXNpYmxlKHZpc2libGVNZXNz YWdlKSkKKyAgICAgICAgICAgICAgICBpZiAodGhpcy5fc2hvdWxkQmVWaXNpYmxlKHZpc2libGVN ZXNzYWdlKSkgewogICAgICAgICAgICAgICAgICAgICBuZXdWaXNpYmxlTWVzc2FnZXMucHVzaCh2 aXNpYmxlTWVzc2FnZSk7Ci0gICAgICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAg ICAgIGlmIChzb3VyY2VNZXNzYWdlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5NZXNzYWdlVHlwZS5FbmRHcm91cCkgeworICAgICAgICAgICAgICAgICAgICAgICAgYW5jaG9y ID0gZ3JvdXAuZWxlbWVudDsKKyAgICAgICAgICAgICAgICAgICAgICAgIGdyb3VwID0gZ3JvdXAu cGFyZW50R3JvdXAgfHwgZ3JvdXA7CisgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoc291 cmNlTWVzc2FnZS50eXBlID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5 cGUuU3RhcnRHcm91cCB8fCBzb3VyY2VNZXNzYWdlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25z b2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5TdGFydEdyb3VwQ29sbGFwc2VkKSB7CisgICAgICAgICAg ICAgICAgICAgICAgICBncm91cCA9IHNvdXJjZU1lc3NhZ2UuZ3JvdXA7CisgICAgICAgICAgICAg ICAgICAgICAgICBhbmNob3IgPSBncm91cC5tZXNzYWdlc0VsZW1lbnQuZmlyc3RDaGlsZDsKKyAg ICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICAgICAgICAgIHZpc2libGVNZXNzYWdlLndpbGxIaWRlKCk7Ci0gICAgICAgICAgICAgICAgICAg IHZpc2libGVNZXNzYWdlLnRvTWVzc2FnZUVsZW1lbnQoKS5yZW1vdmVTZWxmKCk7ICAgICAgICAg ICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgdmlzaWJsZU1lc3NhZ2UudG9NZXNzYWdl RWxlbWVudCgpLnJlbW92ZVNlbGYoKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgICAgIGlmICh0aGlzLl9zaG91bGRCZVZpc2libGUoc291cmNl TWVzc2FnZSkpIHsKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5jdXJyZW50R3JvdXAuYWRkTWVz c2FnZShzb3VyY2VNZXNzYWdlLCB2aXNpYmxlTWVzc2FnZSA/IHZpc2libGVNZXNzYWdlLnRvTWVz c2FnZUVsZW1lbnQoKSA6IG51bGwpOworICAgICAgICAgICAgICAgICAgICBncm91cC5hZGRNZXNz YWdlKHNvdXJjZU1lc3NhZ2UsIGFuY2hvciA/IGFuY2hvci5uZXh0U2libGluZyA6IGdyb3VwLm1l c3NhZ2VzRWxlbWVudC5maXJzdENoaWxkKTsKICAgICAgICAgICAgICAgICAgICAgbmV3VmlzaWJs ZU1lc3NhZ2VzLnB1c2goc291cmNlTWVzc2FnZSk7CisgICAgICAgICAgICAgICAgICAgIGFuY2hv ciA9IHNvdXJjZU1lc3NhZ2UudG9NZXNzYWdlRWxlbWVudCgpOwogICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtNjU0LDggKzY3MCw5IEBAIFdlYkluc3BlY3Rv ci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBpZiAoIXJlc3VsdCkK ICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLl9hcHBlbmRDb25zb2xlTWVzc2Fn ZShuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kUmVzdWx0KHJlc3VsdCwgd2FzVGhyb3du LCBvcmlnaW5hdGluZ0NvbW1hbmQsIHRoaXMuX2xpbmtpZmllcikpOworICAgICAgICB2YXIgbWVz c2FnZSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmRSZXN1bHQocmVzdWx0LCB3YXNU aHJvd24sIG9yaWdpbmF0aW5nQ29tbWFuZCwgdGhpcy5fbGlua2lmaWVyKTsKKyAgICAgICAgdGhp cy5fbWVzc2FnZXMucHVzaChtZXNzYWdlKTsKKyAgICAgICAgdGhpcy5fYXBwZW5kQ29uc29sZU1l c3NhZ2UobWVzc2FnZSk7CiAgICAgfSwKIAogICAgIF9hcHBlbmRDb21tYW5kOiBmdW5jdGlvbih0 ZXh0LCBuZXdQcm9tcHRUZXh0LCB1c2VDb21tYW5kTGluZUFQSSwgc2hvd1Jlc3VsdE9ubHkpCkBA IC02NjMsNiArNjgwLDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsK ICAgICAgICAgaWYgKCFzaG93UmVzdWx0T25seSkgewogICAgICAgICAgICAgdmFyIGNvbW1hbmRN ZXNzYWdlID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZCh0ZXh0KTsKICAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLmludGVycnVwdFJlcGVhdENvdW50KCk7CisgICAgICAg ICAgICB0aGlzLl9tZXNzYWdlcy5wdXNoKGNvbW1hbmRNZXNzYWdlKTsKICAgICAgICAgICAgIHRo aXMuX2FwcGVuZENvbnNvbGVNZXNzYWdlKGNvbW1hbmRNZXNzYWdlKTsKICAgICAgICAgfQogICAg ICAgICB0aGlzLnByb21wdC50ZXh0ID0gbmV3UHJvbXB0VGV4dDsK