108601 2013-02-01 01:59:40 -0800 Web Inspector: Navigator should not create tree elements for uiSourceCodes unless neededm should populate folders on expand only. 2013-02-01 07:45:03 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov buildbot keishi loislo pfeldman pmuellr rniwa vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 822516 0 vsevik 2013-02-01 01:59:40 -0800 Patch to follow. 822560 1 185997 vsevik 2013-02-01 02:48:02 -0800 Created attachment 185997 Patch 822582 2 185997 buildbot 2013-02-01 03:37:43 -0800 Comment on attachment 185997 Patch Attachment 185997 did not pass mac-wk2-ews (mac-wk2): Output: http://queues.webkit.org/results/16302583 New failing tests: inspector/debugger/scripts-sorting.html inspector/debugger/scripts-file-selector.html 822624 3 186009 vsevik 2013-02-01 04:39:42 -0800 Created attachment 186009 Patch 822773 4 186009 webkit.review.bot 2013-02-01 07:44:59 -0800 Comment on attachment 186009 Patch Clearing flags on attachment: 186009 Committed r141593: <http://trac.webkit.org/changeset/141593> 822774 5 webkit.review.bot 2013-02-01 07:45:03 -0800 All reviewed patches have been landed. Closing bug. 185997 2013-02-01 02:48:02 -0800 2013-02-01 04:39:38 -0800 Patch bug-108601-20130201144445.patch text/plain 11594 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjM5NTY1Mzk2NTA0Y2Rh OTVjZjhmZWFlMGZmYmI5MzM2MDBmYWZjOC4uN2UwZjMyODY0MzY0ZDhjNzY4Zjc1M2E3YjI0Njg4 N2FiYjAwMTViNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEzLTAyLTAxICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IE5hdmlnYXRvciBzaG91bGQgbm90IGNyZWF0ZSB0cmVlIGVsZW1lbnRzIGZvciB1aVNvdXJj ZUNvZGVzIHVubGVzcyBuZWVkZWRtIHNob3VsZCBwb3B1bGF0ZSBmb2xkZXJzIG9uIGV4cGFuZCBv bmx5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4 NjAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuTmF2aWdhdG9yVmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5w cm90b3R5cGUuYWRkVUlTb3VyY2VDb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0 b3JWaWV3LnByb3RvdHlwZS5fZ2V0T3JDcmVhdGVTY3JpcHRUcmVlRWxlbWVudCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUuX2dldFNjcmlwdFRyZWVFbGVt ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZS5fY3Jl YXRlU2NyaXB0VHJlZUVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZp ZXcucHJvdG90eXBlLl9yZW1vdmVTY3JpcHRUcmVlRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUuX3VwZGF0ZVNjcmlwdFRpdGxlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZS5pc1NjcmlwdFNvdXJjZUFk ZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZS5yZXZl YWxVSVNvdXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcucHJv dG90eXBlLnJlbW92ZVVJU291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdh dG9yVmlldy5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRv clZpZXcucHJvdG90eXBlLmNyZWF0ZUZvbGRlclRyZWVFbGVtZW50KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZS5fcG9wdWxhdGVGb2xkZXJUcmVlRWxlbWVu dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUuX2FkZFNj cmlwdFRyZWVFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnBy b3RvdHlwZS5fYWRvcHRVSVNvdXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmln YXRvckZvbGRlclRyZWVFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JG b2xkZXJUcmVlRWxlbWVudC5wcm90b3R5cGUub25wb3B1bGF0ZSk6CisKKzIwMTMtMDItMDEgIFZz ZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogVGFiYmVkRWRpdG9yQ29udGFpbmVyLkhpc3RvcnkgcGVyZm9ybWFuY2Ugb3B0aW1pemF0 aW9uLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4 NTgxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmF2 aWdhdG9yVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmF2aWdh dG9yVmlldy5qcwppbmRleCBhMTE5NzFmYzhlNGZkNDllNWE3ZGFkZDRlYjk5OTU5OTJjYzYyNDNl Li5iOGQxZGI0NTgwZmViYTY5MTNhOTcyNjQ2YmI0MGZjMmYyOTU5MmE2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JWaWV3LmpzCkBAIC01 MiwxMyArNTIsMTggQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcgPSBmdW5jdGlvbigpCiAg ICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHNjcmlwdHNPdXRsaW5lRWxlbWVudCk7CiAgICAg dGhpcy5zZXREZWZhdWx0Rm9jdXNlZEVsZW1lbnQodGhpcy5fc2NyaXB0c1RyZWUuZWxlbWVudCk7 CiAKKyAgICAvKiogQHR5cGUge09iamVjdC48c3RyaW5nLCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9y Rm9sZGVyVHJlZUVsZW1lbnQ+fSAqLwogICAgIHRoaXMuX2ZvbGRlclRyZWVFbGVtZW50cyA9IHt9 OwotICAgIHRoaXMuX3NjcmlwdFRyZWVFbGVtZW50c0J5VUlTb3VyY2VDb2RlID0gbmV3IE1hcCgp OworICAgIC8qKiBAdHlwZSB7T2JqZWN0LjxzdHJpbmcsIEFycmF5LjxXZWJJbnNwZWN0b3IuVUlT b3VyY2VDb2RlPj59ICovCisgICAgdGhpcy5fZm9sZGVyVHJlZUVsZW1lbnRzVUlTb3VyY2VDb2Rl cyA9IHt9OworICAgIC8qKiBAdHlwZSB7T2JqZWN0LjxzdHJpbmcsIFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGU+fSAqLworICAgIHRoaXMuX3VpU291cmNlQ29kZXMgPSB7fTsKKyAgICAvKiogQHR5 cGUge09iamVjdC48c3RyaW5nLCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yU291cmNlVHJlZUVsZW1l bnQ+fSAqLworICAgIHRoaXMuX3NjcmlwdFRyZWVFbGVtZW50cyA9IHt9OwogCiAgICAgV2ViSW5z cGVjdG9yLnNldHRpbmdzLnNob3dTY3JpcHRGb2xkZXJzLmFkZENoYW5nZUxpc3RlbmVyKHRoaXMu X3Nob3dTY3JpcHRGb2xkZXJzU2V0dGluZ0NoYW5nZWQuYmluZCh0aGlzKSk7CiB9CiAKLQogV2Vi SW5zcGVjdG9yLk5hdmlnYXRvclZpZXcuRXZlbnRzID0gewogICAgIEl0ZW1TZWxlY3RlZDogIkl0 ZW1TZWxlY3RlZCIsCiAgICAgRmlsZVJlbmFtZWQ6ICJGaWxlUmVuYW1lZCIKQEAgLTcwLDE2ICs3 NSw0MiBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICov CiAgICAgYWRkVUlTb3VyY2VDb2RlOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAgewotICAg ICAgICBpZiAodGhpcy5fc2NyaXB0VHJlZUVsZW1lbnRzQnlVSVNvdXJjZUNvZGUuZ2V0KHVpU291 cmNlQ29kZSkpCisgICAgICAgIGlmICh0aGlzLl91aVNvdXJjZUNvZGVzW3VpU291cmNlQ29kZS51 cmkoKV0pCiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZXNb dWlTb3VyY2VDb2RlLnVyaSgpXSA9IHVpU291cmNlQ29kZTsKKworICAgICAgICB2YXIgZm9sZGVy VHJlZUVsZW1lbnQgPSB0aGlzLmdldE9yQ3JlYXRlRm9sZGVyVHJlZUVsZW1lbnQodWlTb3VyY2VD b2RlKTsKKyAgICAgICAgdGhpcy5fYWRvcHRVSVNvdXJjZUNvZGUoZm9sZGVyVHJlZUVsZW1lbnQs IHVpU291cmNlQ29kZSk7CisgICAgfSwKIAorICAgIF9nZXRPckNyZWF0ZVNjcmlwdFRyZWVFbGVt ZW50OiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5f Z2V0U2NyaXB0VHJlZUVsZW1lbnQodWlTb3VyY2VDb2RlKSB8fCB0aGlzLl9jcmVhdGVTY3JpcHRU cmVlRWxlbWVudCh1aVNvdXJjZUNvZGUpOworICAgIH0sCisKKyAgICBfZ2V0U2NyaXB0VHJlZUVs ZW1lbnQ6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlz Ll9zY3JpcHRUcmVlRWxlbWVudHNbdWlTb3VyY2VDb2RlLnVyaSgpXTsKKyAgICB9LAorCisgICAg X2NyZWF0ZVNjcmlwdFRyZWVFbGVtZW50OiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCisgICAgewog ICAgICAgICB2YXIgc2NyaXB0VHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLk5hdmlnYXRv clNvdXJjZVRyZWVFbGVtZW50KHRoaXMsIHVpU291cmNlQ29kZSwgIiIpOwotICAgICAgICB0aGlz Ll9zY3JpcHRUcmVlRWxlbWVudHNCeVVJU291cmNlQ29kZS5wdXQodWlTb3VyY2VDb2RlLCBzY3Jp cHRUcmVlRWxlbWVudCk7CisgICAgICAgIHRoaXMuX3NjcmlwdFRyZWVFbGVtZW50c1t1aVNvdXJj ZUNvZGUudXJpKCldID0gc2NyaXB0VHJlZUVsZW1lbnQ7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVNj cmlwdFRpdGxlKHVpU291cmNlQ29kZSk7CiAgICAgICAgIHRoaXMuX2FkZFVJU291cmNlQ29kZUxp c3RlbmVycyh1aVNvdXJjZUNvZGUpOworICAgICAgICByZXR1cm4gc2NyaXB0VHJlZUVsZW1lbnQ7 CisgICAgfSwKIAotICAgICAgICB2YXIgZm9sZGVyVHJlZUVsZW1lbnQgPSB0aGlzLmdldE9yQ3Jl YXRlRm9sZGVyVHJlZUVsZW1lbnQodWlTb3VyY2VDb2RlKTsKLSAgICAgICAgZm9sZGVyVHJlZUVs ZW1lbnQuYXBwZW5kQ2hpbGQoc2NyaXB0VHJlZUVsZW1lbnQpOworICAgIF9yZW1vdmVTY3JpcHRU cmVlRWxlbWVudDogZnVuY3Rpb24odWlTb3VyY2VDb2RlKQorICAgIHsKKyAgICAgICAgdmFyIHNj cmlwdFRyZWVFbGVtZW50ID0gdGhpcy5fc2NyaXB0VHJlZUVsZW1lbnRzW3VpU291cmNlQ29kZS51 cmkoKV07CisgICAgICAgIGlmICghc2NyaXB0VHJlZUVsZW1lbnQpCisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIGlmIChzY3JpcHRUcmVlRWxlbWVudC5wYXJlbnQpCisgICAgICAgICAgICBz Y3JpcHRUcmVlRWxlbWVudC5wYXJlbnQucmVtb3ZlQ2hpbGQoc2NyaXB0VHJlZUVsZW1lbnQpOwor ICAgICAgICBkZWxldGUgdGhpcy5fc2NyaXB0VHJlZUVsZW1lbnRzW3VpU291cmNlQ29kZS51cmko KV07CisgICAgICAgIHRoaXMuX3JlbW92ZVVJU291cmNlQ29kZUxpc3RlbmVycyh1aVNvdXJjZUNv ZGUpOwogICAgIH0sCiAKICAgICBfdWlTb3VyY2VDb2RlVGl0bGVDaGFuZ2VkOiBmdW5jdGlvbihl dmVudCkKQEAgLTExMiw3ICsxNDMsNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90 b3R5cGUgPSB7CiAgICAgICovCiAgICAgX3VwZGF0ZVNjcmlwdFRpdGxlOiBmdW5jdGlvbih1aVNv dXJjZUNvZGUsIGlnbm9yZUlzRGlydHkpCiAgICAgewotICAgICAgICB2YXIgc2NyaXB0VHJlZUVs ZW1lbnQgPSB0aGlzLl9zY3JpcHRUcmVlRWxlbWVudHNCeVVJU291cmNlQ29kZS5nZXQodWlTb3Vy Y2VDb2RlKTsKKyAgICAgICAgdmFyIHNjcmlwdFRyZWVFbGVtZW50ID0gdGhpcy5fZ2V0U2NyaXB0 VHJlZUVsZW1lbnQodWlTb3VyY2VDb2RlKTsKICAgICAgICAgaWYgKCFzY3JpcHRUcmVlRWxlbWVu dCkKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMTM2LDggKzE2Nyw3IEBAIFdlYkluc3BlY3Rv ci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBpc1NjcmlwdFNvdXJj ZUFkZGVkOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAgewotICAgICAgICB2YXIgc2NyaXB0 VHJlZUVsZW1lbnQgPSB0aGlzLl9zY3JpcHRUcmVlRWxlbWVudHNCeVVJU291cmNlQ29kZS5nZXQo dWlTb3VyY2VDb2RlKTsKLSAgICAgICAgcmV0dXJuICEhc2NyaXB0VHJlZUVsZW1lbnQ7CisgICAg ICAgIHJldHVybiAhIXRoaXMuX3VpU291cmNlQ29kZXNbdWlTb3VyY2VDb2RlLnVyaSgpXTsKICAg ICB9LAogCiAgICAgLyoqCkBAIC0xNTAsNyArMTgwLDEwIEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0 b3JWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLl9sYXN0U2VsZWN0ZWRVSVNvdXJj ZUNvZGUgPSB1aVNvdXJjZUNvZGU7CiAKLSAgICAgICAgdmFyIHNjcmlwdFRyZWVFbGVtZW50ID0g dGhpcy5fc2NyaXB0VHJlZUVsZW1lbnRzQnlVSVNvdXJjZUNvZGUuZ2V0KHVpU291cmNlQ29kZSk7 CisgICAgICAgIHZhciBmb2xkZXJUcmVlRWxlbWVudCA9IHRoaXMuZ2V0T3JDcmVhdGVGb2xkZXJU cmVlRWxlbWVudCh1aVNvdXJjZUNvZGUpOworICAgICAgICBpZiAoIWZvbGRlclRyZWVFbGVtZW50 Ll9wb3B1bGF0ZWQgJiYgZm9sZGVyVHJlZUVsZW1lbnQucGFyZW50KQorICAgICAgICAgICAgZm9s ZGVyVHJlZUVsZW1lbnQub25wb3B1bGF0ZSgpOworICAgICAgICB2YXIgc2NyaXB0VHJlZUVsZW1l bnQgPSB0aGlzLl9nZXRPckNyZWF0ZVNjcmlwdFRyZWVFbGVtZW50KHVpU291cmNlQ29kZSk7CiAg ICAgICAgIHNjcmlwdFRyZWVFbGVtZW50LnJldmVhbEFuZFNlbGVjdCh0cnVlKTsKICAgICB9LAog CkBAIC0xNzAsMjAgKzIwMywyMCBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICovCiAgICAgcmVtb3ZlVUlTb3VyY2VDb2RlOiBmdW5jdGlvbih1aVNvdXJj ZUNvZGUpCiAgICAgewotICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLl9zY3JpcHRUcmVl RWxlbWVudHNCeVVJU291cmNlQ29kZS5nZXQodWlTb3VyY2VDb2RlKTsKKyAgICAgICAgdGhpcy5f cmVtb3ZlU2NyaXB0VHJlZUVsZW1lbnQodWlTb3VyY2VDb2RlKTsKKyAgICAgICAgdmFyIHRyZWVF bGVtZW50ID0gdGhpcy5nZXRPckNyZWF0ZUZvbGRlclRyZWVFbGVtZW50KHVpU291cmNlQ29kZSk7 CiAgICAgICAgIHdoaWxlICh0cmVlRWxlbWVudCkgewogICAgICAgICAgICAgdmFyIHBhcmVudCA9 IHRyZWVFbGVtZW50LnBhcmVudDsKICAgICAgICAgICAgIGlmIChwYXJlbnQpIHsKLSAgICAgICAg ICAgICAgICBpZiAodHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuTmF2aWdhdG9y Rm9sZGVyVHJlZUVsZW1lbnQpCi0gICAgICAgICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9mb2xk ZXJUcmVlRWxlbWVudHNbdHJlZUVsZW1lbnQuZm9sZGVySWRlbnRpZmllcl07CisgICAgICAgICAg ICAgICAgZGVsZXRlIHRoaXMuX2ZvbGRlclRyZWVFbGVtZW50c1t0cmVlRWxlbWVudC5mb2xkZXJJ ZGVudGlmaWVyXTsKKyAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fZm9sZGVyVHJlZUVsZW1l bnRzVUlTb3VyY2VDb2Rlc1t0cmVlRWxlbWVudC5mb2xkZXJJZGVudGlmaWVyXTsKICAgICAgICAg ICAgICAgICBwYXJlbnQucmVtb3ZlQ2hpbGQodHJlZUVsZW1lbnQpOwogICAgICAgICAgICAgICAg IGlmIChwYXJlbnQuY2hpbGRyZW4ubGVuZ3RoKQogICAgICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHRyZWVFbGVtZW50ID0gcGFyZW50OwogICAgICAg ICB9Ci0gICAgICAgIHRoaXMuX3NjcmlwdFRyZWVFbGVtZW50c0J5VUlTb3VyY2VDb2RlLnJlbW92 ZSh1aVNvdXJjZUNvZGUpOwotICAgICAgICB0aGlzLl9yZW1vdmVVSVNvdXJjZUNvZGVMaXN0ZW5l cnModWlTb3VyY2VDb2RlKTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX3VpU291cmNlQ29kZXNbdWlT b3VyY2VDb2RlLnVyaSgpXTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0yMzIsNyArMjY1LDcgQEAg V2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcucHJvdG90eXBlID0gewogICAgICAqLwogICAgIHJl bmFtZTogZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIHZh ciBzY3JpcHRUcmVlRWxlbWVudCA9IHRoaXMuX3NjcmlwdFRyZWVFbGVtZW50c0J5VUlTb3VyY2VD b2RlLmdldCh1aVNvdXJjZUNvZGUpOworICAgICAgICB2YXIgc2NyaXB0VHJlZUVsZW1lbnQgPSB0 aGlzLl9nZXRTY3JpcHRUcmVlRWxlbWVudFt1aVNvdXJjZUNvZGUudXJpKCldOwogICAgICAgICBp ZiAoIXNjcmlwdFRyZWVFbGVtZW50KQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0yNzgsNyAr MzExLDkgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl9zY3JpcHRzVHJlZS5zdG9wU2VhcmNoKCk7CiAgICAgICAgIHRoaXMuX3NjcmlwdHNU cmVlLnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgICAgIHRoaXMuX2ZvbGRlclRyZWVFbGVtZW50cyA9 IHt9OwotICAgICAgICB0aGlzLl9zY3JpcHRUcmVlRWxlbWVudHNCeVVJU291cmNlQ29kZS5jbGVh cigpOworICAgICAgICB0aGlzLl9mb2xkZXJUcmVlRWxlbWVudHNVSVNvdXJjZUNvZGVzID0ge307 CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZXMgPSB7fTsKKyAgICAgICAgdGhpcy5fc2NyaXB0 VHJlZUVsZW1lbnRzID0ge307CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMjg4LDEzICszMjMsMjgg QEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcucHJvdG90eXBlID0gewogICAgICAqLwogICAg IGNyZWF0ZUZvbGRlclRyZWVFbGVtZW50OiBmdW5jdGlvbihwYXJlbnRGb2xkZXJFbGVtZW50LCBm b2xkZXJJZGVudGlmaWVyLCBkb21haW4sIGZvbGRlck5hbWUpCiAgICAgewotICAgICAgICB2YXIg Zm9sZGVyVHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLk5hdmlnYXRvckZvbGRlclRyZWVF bGVtZW50KGZvbGRlcklkZW50aWZpZXIsIGRvbWFpbiwgZm9sZGVyTmFtZSk7Ci0gICAgICAgIHBh cmVudEZvbGRlckVsZW1lbnQuYXBwZW5kQ2hpbGQoZm9sZGVyVHJlZUVsZW1lbnQpOworICAgICAg ICB2YXIgZm9sZGVyVHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLk5hdmlnYXRvckZvbGRl clRyZWVFbGVtZW50KHRoaXMsIGZvbGRlcklkZW50aWZpZXIsIGRvbWFpbiwgZm9sZGVyTmFtZSk7 CiAgICAgICAgIHRoaXMuX2ZvbGRlclRyZWVFbGVtZW50c1tmb2xkZXJJZGVudGlmaWVyXSA9IGZv bGRlclRyZWVFbGVtZW50OworICAgICAgICB0aGlzLl9mb2xkZXJUcmVlRWxlbWVudHNVSVNvdXJj ZUNvZGVzW2ZvbGRlcklkZW50aWZpZXJdID0gW107CisgICAgICAgIHBhcmVudEZvbGRlckVsZW1l bnQuYXBwZW5kQ2hpbGQoZm9sZGVyVHJlZUVsZW1lbnQpOwogICAgICAgICByZXR1cm4gZm9sZGVy VHJlZUVsZW1lbnQ7CiAgICAgfSwKIAogICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLk5hdmlnYXRvckZvbGRlclRyZWVFbGVtZW50fSBmb2xkZXJUcmVlRWxlbWVudAorICAgICAq LworICAgIF9wb3B1bGF0ZUZvbGRlclRyZWVFbGVtZW50OiBmdW5jdGlvbihmb2xkZXJUcmVlRWxl bWVudCkKKyAgICB7CisgICAgICAgIGlmIChmb2xkZXJUcmVlRWxlbWVudC5fcG9wdWxhdGVkKQor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBmb2xkZXJUcmVlRWxlbWVudC5fcG9wdWxhdGVk ID0gdHJ1ZTsKKyAgICAgICAgdmFyIHVpU291cmNlQ29kZXMgPSB0aGlzLl9mb2xkZXJUcmVlRWxl bWVudHNVSVNvdXJjZUNvZGVzW2ZvbGRlclRyZWVFbGVtZW50LmZvbGRlcklkZW50aWZpZXJdOwor ICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHVpU291cmNlQ29kZXMubGVuZ3RoOyArK2kpCisg ICAgICAgICAgICB0aGlzLl9hZGRTY3JpcHRUcmVlRWxlbWVudChmb2xkZXJUcmVlRWxlbWVudCwg dWlTb3VyY2VDb2Rlc1tpXSk7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9mb2xkZXJUcmVlRWxlbWVu dHNVSVNvdXJjZUNvZGVzW2ZvbGRlclRyZWVFbGVtZW50LmZvbGRlcklkZW50aWZpZXJdOworICAg IH0sCisKKyAgICAvKioKICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9 IHVpU291cmNlQ29kZQogICAgICAqLwogICAgIGdldE9yQ3JlYXRlRm9sZGVyVHJlZUVsZW1lbnQ6 IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKQEAgLTMyNyw2ICszNzcsMjEgQEAgV2ViSW5zcGVjdG9y Lk5hdmlnYXRvclZpZXcucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5jcmVhdGVG b2xkZXJUcmVlRWxlbWVudChwYXJlbnRGb2xkZXJFbGVtZW50LCBmb2xkZXJJZGVudGlmaWVyLCBk b21haW4sIGZvbGRlck5hbWUpOwogICAgIH0sCiAKKyAgICBfYWRkU2NyaXB0VHJlZUVsZW1lbnQ6 IGZ1bmN0aW9uKGZvbGRlclRyZWVFbGVtZW50LCB1aVNvdXJjZUNvZGUpCisgICAgeworICAgICAg ICB2YXIgc2NyaXB0VHJlZUVsZW1lbnQgPSB0aGlzLl9nZXRPckNyZWF0ZVNjcmlwdFRyZWVFbGVt ZW50KHVpU291cmNlQ29kZSk7CisgICAgICAgIGZvbGRlclRyZWVFbGVtZW50LmFwcGVuZENoaWxk KHNjcmlwdFRyZWVFbGVtZW50KTsKKyAgICB9LAorCisgICAgX2Fkb3B0VUlTb3VyY2VDb2RlOiBm dW5jdGlvbihmb2xkZXJUcmVlRWxlbWVudCwgdWlTb3VyY2VDb2RlKQorICAgIHsKKyAgICAgICAg aWYgKGZvbGRlclRyZWVFbGVtZW50Ll9wb3B1bGF0ZWQgfHwgIWZvbGRlclRyZWVFbGVtZW50LnBh cmVudCkgeworICAgICAgICAgICAgdGhpcy5fYWRkU2NyaXB0VHJlZUVsZW1lbnQoZm9sZGVyVHJl ZUVsZW1lbnQsIHVpU291cmNlQ29kZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KyAgICAgICAgdGhpcy5fZm9sZGVyVHJlZUVsZW1lbnRzVUlTb3VyY2VDb2Rlc1tmb2xkZXJUcmVl RWxlbWVudC5mb2xkZXJJZGVudGlmaWVyXS5wdXNoKHVpU291cmNlQ29kZSk7CisgICAgfSwKKwog ICAgIGhhbmRsZUNvbnRleHRNZW51OiBmdW5jdGlvbihldmVudCwgdWlTb3VyY2VDb2RlKQogICAg IHsKICAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVu dShldmVudCk7CkBAIC00OTksMTIgKzU2NCwxNCBAQCBXZWJJbnNwZWN0b3IuQmFzZU5hdmlnYXRv clRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0 ZW5kcyB7V2ViSW5zcGVjdG9yLkJhc2VOYXZpZ2F0b3JUcmVlRWxlbWVudH0KKyAqIEBwYXJhbSB7 V2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXd9IG5hdmlnYXRvclZpZXcKICAqIEBwYXJhbSB7c3Ry aW5nfSBmb2xkZXJJZGVudGlmaWVyCiAgKiBAcGFyYW0ge3N0cmluZ30gZG9tYWluCiAgKiBAcGFy YW0ge3N0cmluZ30gZm9sZGVyTmFtZQogICovCi1XZWJJbnNwZWN0b3IuTmF2aWdhdG9yRm9sZGVy VHJlZUVsZW1lbnQgPSBmdW5jdGlvbihmb2xkZXJJZGVudGlmaWVyLCBkb21haW4sIGZvbGRlck5h bWUpCitXZWJJbnNwZWN0b3IuTmF2aWdhdG9yRm9sZGVyVHJlZUVsZW1lbnQgPSBmdW5jdGlvbihu YXZpZ2F0b3JWaWV3LCBmb2xkZXJJZGVudGlmaWVyLCBkb21haW4sIGZvbGRlck5hbWUpCiB7Cisg ICAgdGhpcy5fbmF2aWdhdG9yVmlldyA9IG5hdmlnYXRvclZpZXc7CiAgICAgdGhpcy5fZm9sZGVy SWRlbnRpZmllciA9IGZvbGRlcklkZW50aWZpZXI7CiAgICAgdGhpcy5fZm9sZGVyTmFtZSA9IGZv bGRlck5hbWU7CiAgICAgCkBAIC01MzIsNiArNTk5LDExIEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0 b3JGb2xkZXJUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9m b2xkZXJOYW1lID09PSAiIjsKICAgICB9LAogICAgIAorICAgIG9ucG9wdWxhdGU6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIHRoaXMuX25hdmlnYXRvclZpZXcuX3BvcHVsYXRlRm9sZGVyVHJl ZUVsZW1lbnQodGhpcyk7CisgICAgfSwKKwogICAgIG9uYXR0YWNoOiBmdW5jdGlvbigpCiAgICAg ewogICAgICAgICBXZWJJbnNwZWN0b3IuQmFzZU5hdmlnYXRvclRyZWVFbGVtZW50LnByb3RvdHlw ZS5vbmF0dGFjaC5jYWxsKHRoaXMpOwo= 186009 2013-02-01 04:39:42 -0800 2013-02-01 07:44:59 -0800 Patch bug-108601-20130201163624.patch text/plain 19809 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjM5NTY1Mzk2NTA0Y2Rh OTVjZjhmZWFlMGZmYmI5MzM2MDBmYWZjOC4uNTA1NzRkOWMzMDBjZDRhZGY1NDAzNDAwYTM0NWJj ZTQxNGNkZGYwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDEzLTAyLTAxICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IE5hdmlnYXRvciBzaG91bGQgbm90IGNyZWF0ZSB0cmVlIGVsZW1lbnRzIGZvciB1aVNvdXJj ZUNvZGVzIHVubGVzcyBuZWVkZWRtIHNob3VsZCBwb3B1bGF0ZSBmb2xkZXJzIG9uIGV4cGFuZCBv bmx5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4 NjAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHJl ZSBlbGVtZW1udHMgZm9yIHVpU291cmNlQ29kZXMgYXJlIG5vdCBjcmVhdGVkIHVudGlsIHJlYWxs eSBuZWVkZWQgYW55bW9yZS4KKyAgICAgICAgVGhleSBhcmUgbm93IGNyZWF0ZWQgd2hlbiBwYXJl bnQgZm9sZGVyIHRyZWUgZWxlbWVtbnRzIGFyZSBleHBhbmRlZCBvciB3aGVuIHVpU291cmNlQ29k ZSBpcyByZXZlYWxlZCBpbiBuYXZpZ2F0b3IuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL05hdmlnYXRvclZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmll dyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUuYWRkVUlT b3VyY2VDb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlw ZS5fZ2V0T3JDcmVhdGVTY3JpcHRUcmVlRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu TmF2aWdhdG9yVmlldy5wcm90b3R5cGUuX2dldFNjcmlwdFRyZWVFbGVtZW50KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZS5fY3JlYXRlU2NyaXB0VHJlZUVs ZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcucHJvdG90eXBlLl9y ZW1vdmVTY3JpcHRUcmVlRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9y Vmlldy5wcm90b3R5cGUuX3VwZGF0ZVNjcmlwdFRpdGxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZS5pc1NjcmlwdFNvdXJjZUFkZGVkKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZS5yZXZlYWxVSVNvdXJjZUNvZGUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcucHJvdG90eXBlLnJlbW92ZVVJ U291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5 cGUucmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcucHJvdG90eXBl LmNyZWF0ZUZvbGRlclRyZWVFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0 b3JWaWV3LnByb3RvdHlwZS5fcG9wdWxhdGVGb2xkZXJUcmVlRWxlbWVudCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUuX2FkZFNjcmlwdFRyZWVFbGVtZW50 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZS5fYWRvcHRV SVNvdXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvckZvbGRlclRyZWVF bGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JGb2xkZXJUcmVlRWxlbWVu dC5wcm90b3R5cGUub25wb3B1bGF0ZSk6CisKKzIwMTMtMDItMDEgIFZzZXZvbG9kIFZsYXNvdiAg PHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogVGFiYmVkRWRp dG9yQ29udGFpbmVyLkhpc3RvcnkgcGVyZm9ybWFuY2Ugb3B0aW1pemF0aW9uLgogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4NTgxCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmF2aWdhdG9yVmlldy5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmF2aWdhdG9yVmlldy5qcwppbmRl eCBhMTE5NzFmYzhlNGZkNDllNWE3ZGFkZDRlYjk5OTU5OTJjYzYyNDNlLi5iOGQxZGI0NTgwZmVi YTY5MTNhOTcyNjQ2YmI0MGZjMmYyOTU5MmE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JWaWV3LmpzCkBAIC01MiwxMyArNTIsMTggQEAg V2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5lbGVtZW50 LmFwcGVuZENoaWxkKHNjcmlwdHNPdXRsaW5lRWxlbWVudCk7CiAgICAgdGhpcy5zZXREZWZhdWx0 Rm9jdXNlZEVsZW1lbnQodGhpcy5fc2NyaXB0c1RyZWUuZWxlbWVudCk7CiAKKyAgICAvKiogQHR5 cGUge09iamVjdC48c3RyaW5nLCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yRm9sZGVyVHJlZUVsZW1l bnQ+fSAqLwogICAgIHRoaXMuX2ZvbGRlclRyZWVFbGVtZW50cyA9IHt9OwotICAgIHRoaXMuX3Nj cmlwdFRyZWVFbGVtZW50c0J5VUlTb3VyY2VDb2RlID0gbmV3IE1hcCgpOworICAgIC8qKiBAdHlw ZSB7T2JqZWN0LjxzdHJpbmcsIEFycmF5LjxXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlPj59ICov CisgICAgdGhpcy5fZm9sZGVyVHJlZUVsZW1lbnRzVUlTb3VyY2VDb2RlcyA9IHt9OworICAgIC8q KiBAdHlwZSB7T2JqZWN0LjxzdHJpbmcsIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fSAqLwor ICAgIHRoaXMuX3VpU291cmNlQ29kZXMgPSB7fTsKKyAgICAvKiogQHR5cGUge09iamVjdC48c3Ry aW5nLCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yU291cmNlVHJlZUVsZW1lbnQ+fSAqLworICAgIHRo aXMuX3NjcmlwdFRyZWVFbGVtZW50cyA9IHt9OwogCiAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdz LnNob3dTY3JpcHRGb2xkZXJzLmFkZENoYW5nZUxpc3RlbmVyKHRoaXMuX3Nob3dTY3JpcHRGb2xk ZXJzU2V0dGluZ0NoYW5nZWQuYmluZCh0aGlzKSk7CiB9CiAKLQogV2ViSW5zcGVjdG9yLk5hdmln YXRvclZpZXcuRXZlbnRzID0gewogICAgIEl0ZW1TZWxlY3RlZDogIkl0ZW1TZWxlY3RlZCIsCiAg ICAgRmlsZVJlbmFtZWQ6ICJGaWxlUmVuYW1lZCIKQEAgLTcwLDE2ICs3NSw0MiBAQCBXZWJJbnNw ZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgYWRkVUlTb3Vy Y2VDb2RlOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAgewotICAgICAgICBpZiAodGhpcy5f c2NyaXB0VHJlZUVsZW1lbnRzQnlVSVNvdXJjZUNvZGUuZ2V0KHVpU291cmNlQ29kZSkpCisgICAg ICAgIGlmICh0aGlzLl91aVNvdXJjZUNvZGVzW3VpU291cmNlQ29kZS51cmkoKV0pCiAgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZXNbdWlTb3VyY2VDb2RlLnVy aSgpXSA9IHVpU291cmNlQ29kZTsKKworICAgICAgICB2YXIgZm9sZGVyVHJlZUVsZW1lbnQgPSB0 aGlzLmdldE9yQ3JlYXRlRm9sZGVyVHJlZUVsZW1lbnQodWlTb3VyY2VDb2RlKTsKKyAgICAgICAg dGhpcy5fYWRvcHRVSVNvdXJjZUNvZGUoZm9sZGVyVHJlZUVsZW1lbnQsIHVpU291cmNlQ29kZSk7 CisgICAgfSwKIAorICAgIF9nZXRPckNyZWF0ZVNjcmlwdFRyZWVFbGVtZW50OiBmdW5jdGlvbih1 aVNvdXJjZUNvZGUpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fZ2V0U2NyaXB0VHJlZUVs ZW1lbnQodWlTb3VyY2VDb2RlKSB8fCB0aGlzLl9jcmVhdGVTY3JpcHRUcmVlRWxlbWVudCh1aVNv dXJjZUNvZGUpOworICAgIH0sCisKKyAgICBfZ2V0U2NyaXB0VHJlZUVsZW1lbnQ6IGZ1bmN0aW9u KHVpU291cmNlQ29kZSkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9zY3JpcHRUcmVlRWxl bWVudHNbdWlTb3VyY2VDb2RlLnVyaSgpXTsKKyAgICB9LAorCisgICAgX2NyZWF0ZVNjcmlwdFRy ZWVFbGVtZW50OiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCisgICAgewogICAgICAgICB2YXIgc2Ny aXB0VHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclNvdXJjZVRyZWVFbGVt ZW50KHRoaXMsIHVpU291cmNlQ29kZSwgIiIpOwotICAgICAgICB0aGlzLl9zY3JpcHRUcmVlRWxl bWVudHNCeVVJU291cmNlQ29kZS5wdXQodWlTb3VyY2VDb2RlLCBzY3JpcHRUcmVlRWxlbWVudCk7 CisgICAgICAgIHRoaXMuX3NjcmlwdFRyZWVFbGVtZW50c1t1aVNvdXJjZUNvZGUudXJpKCldID0g c2NyaXB0VHJlZUVsZW1lbnQ7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVNjcmlwdFRpdGxlKHVpU291 cmNlQ29kZSk7CiAgICAgICAgIHRoaXMuX2FkZFVJU291cmNlQ29kZUxpc3RlbmVycyh1aVNvdXJj ZUNvZGUpOworICAgICAgICByZXR1cm4gc2NyaXB0VHJlZUVsZW1lbnQ7CisgICAgfSwKIAotICAg ICAgICB2YXIgZm9sZGVyVHJlZUVsZW1lbnQgPSB0aGlzLmdldE9yQ3JlYXRlRm9sZGVyVHJlZUVs ZW1lbnQodWlTb3VyY2VDb2RlKTsKLSAgICAgICAgZm9sZGVyVHJlZUVsZW1lbnQuYXBwZW5kQ2hp bGQoc2NyaXB0VHJlZUVsZW1lbnQpOworICAgIF9yZW1vdmVTY3JpcHRUcmVlRWxlbWVudDogZnVu Y3Rpb24odWlTb3VyY2VDb2RlKQorICAgIHsKKyAgICAgICAgdmFyIHNjcmlwdFRyZWVFbGVtZW50 ID0gdGhpcy5fc2NyaXB0VHJlZUVsZW1lbnRzW3VpU291cmNlQ29kZS51cmkoKV07CisgICAgICAg IGlmICghc2NyaXB0VHJlZUVsZW1lbnQpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlm IChzY3JpcHRUcmVlRWxlbWVudC5wYXJlbnQpCisgICAgICAgICAgICBzY3JpcHRUcmVlRWxlbWVu dC5wYXJlbnQucmVtb3ZlQ2hpbGQoc2NyaXB0VHJlZUVsZW1lbnQpOworICAgICAgICBkZWxldGUg dGhpcy5fc2NyaXB0VHJlZUVsZW1lbnRzW3VpU291cmNlQ29kZS51cmkoKV07CisgICAgICAgIHRo aXMuX3JlbW92ZVVJU291cmNlQ29kZUxpc3RlbmVycyh1aVNvdXJjZUNvZGUpOwogICAgIH0sCiAK ICAgICBfdWlTb3VyY2VDb2RlVGl0bGVDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKQEAgLTExMiw3 ICsxNDMsNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUgPSB7CiAgICAg ICovCiAgICAgX3VwZGF0ZVNjcmlwdFRpdGxlOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIGlnbm9y ZUlzRGlydHkpCiAgICAgewotICAgICAgICB2YXIgc2NyaXB0VHJlZUVsZW1lbnQgPSB0aGlzLl9z Y3JpcHRUcmVlRWxlbWVudHNCeVVJU291cmNlQ29kZS5nZXQodWlTb3VyY2VDb2RlKTsKKyAgICAg ICAgdmFyIHNjcmlwdFRyZWVFbGVtZW50ID0gdGhpcy5fZ2V0U2NyaXB0VHJlZUVsZW1lbnQodWlT b3VyY2VDb2RlKTsKICAgICAgICAgaWYgKCFzY3JpcHRUcmVlRWxlbWVudCkKICAgICAgICAgICAg IHJldHVybjsKIApAQCAtMTM2LDggKzE2Nyw3IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3 LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBpc1NjcmlwdFNvdXJjZUFkZGVkOiBmdW5jdGlv bih1aVNvdXJjZUNvZGUpCiAgICAgewotICAgICAgICB2YXIgc2NyaXB0VHJlZUVsZW1lbnQgPSB0 aGlzLl9zY3JpcHRUcmVlRWxlbWVudHNCeVVJU291cmNlQ29kZS5nZXQodWlTb3VyY2VDb2RlKTsK LSAgICAgICAgcmV0dXJuICEhc2NyaXB0VHJlZUVsZW1lbnQ7CisgICAgICAgIHJldHVybiAhIXRo aXMuX3VpU291cmNlQ29kZXNbdWlTb3VyY2VDb2RlLnVyaSgpXTsKICAgICB9LAogCiAgICAgLyoq CkBAIC0xNTAsNyArMTgwLDEwIEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlw ZSA9IHsKIAogICAgICAgICB0aGlzLl9sYXN0U2VsZWN0ZWRVSVNvdXJjZUNvZGUgPSB1aVNvdXJj ZUNvZGU7CiAKLSAgICAgICAgdmFyIHNjcmlwdFRyZWVFbGVtZW50ID0gdGhpcy5fc2NyaXB0VHJl ZUVsZW1lbnRzQnlVSVNvdXJjZUNvZGUuZ2V0KHVpU291cmNlQ29kZSk7CisgICAgICAgIHZhciBm b2xkZXJUcmVlRWxlbWVudCA9IHRoaXMuZ2V0T3JDcmVhdGVGb2xkZXJUcmVlRWxlbWVudCh1aVNv dXJjZUNvZGUpOworICAgICAgICBpZiAoIWZvbGRlclRyZWVFbGVtZW50Ll9wb3B1bGF0ZWQgJiYg Zm9sZGVyVHJlZUVsZW1lbnQucGFyZW50KQorICAgICAgICAgICAgZm9sZGVyVHJlZUVsZW1lbnQu b25wb3B1bGF0ZSgpOworICAgICAgICB2YXIgc2NyaXB0VHJlZUVsZW1lbnQgPSB0aGlzLl9nZXRP ckNyZWF0ZVNjcmlwdFRyZWVFbGVtZW50KHVpU291cmNlQ29kZSk7CiAgICAgICAgIHNjcmlwdFRy ZWVFbGVtZW50LnJldmVhbEFuZFNlbGVjdCh0cnVlKTsKICAgICB9LAogCkBAIC0xNzAsMjAgKzIw MywyMCBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICov CiAgICAgcmVtb3ZlVUlTb3VyY2VDb2RlOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAgewot ICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLl9zY3JpcHRUcmVlRWxlbWVudHNCeVVJU291 cmNlQ29kZS5nZXQodWlTb3VyY2VDb2RlKTsKKyAgICAgICAgdGhpcy5fcmVtb3ZlU2NyaXB0VHJl ZUVsZW1lbnQodWlTb3VyY2VDb2RlKTsKKyAgICAgICAgdmFyIHRyZWVFbGVtZW50ID0gdGhpcy5n ZXRPckNyZWF0ZUZvbGRlclRyZWVFbGVtZW50KHVpU291cmNlQ29kZSk7CiAgICAgICAgIHdoaWxl ICh0cmVlRWxlbWVudCkgewogICAgICAgICAgICAgdmFyIHBhcmVudCA9IHRyZWVFbGVtZW50LnBh cmVudDsKICAgICAgICAgICAgIGlmIChwYXJlbnQpIHsKLSAgICAgICAgICAgICAgICBpZiAodHJl ZUVsZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yRm9sZGVyVHJlZUVsZW1l bnQpCi0gICAgICAgICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9mb2xkZXJUcmVlRWxlbWVudHNb dHJlZUVsZW1lbnQuZm9sZGVySWRlbnRpZmllcl07CisgICAgICAgICAgICAgICAgZGVsZXRlIHRo aXMuX2ZvbGRlclRyZWVFbGVtZW50c1t0cmVlRWxlbWVudC5mb2xkZXJJZGVudGlmaWVyXTsKKyAg ICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fZm9sZGVyVHJlZUVsZW1lbnRzVUlTb3VyY2VDb2Rl c1t0cmVlRWxlbWVudC5mb2xkZXJJZGVudGlmaWVyXTsKICAgICAgICAgICAgICAgICBwYXJlbnQu cmVtb3ZlQ2hpbGQodHJlZUVsZW1lbnQpOwogICAgICAgICAgICAgICAgIGlmIChwYXJlbnQuY2hp bGRyZW4ubGVuZ3RoKQogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIHRyZWVFbGVtZW50ID0gcGFyZW50OwogICAgICAgICB9Ci0gICAgICAgIHRo aXMuX3NjcmlwdFRyZWVFbGVtZW50c0J5VUlTb3VyY2VDb2RlLnJlbW92ZSh1aVNvdXJjZUNvZGUp OwotICAgICAgICB0aGlzLl9yZW1vdmVVSVNvdXJjZUNvZGVMaXN0ZW5lcnModWlTb3VyY2VDb2Rl KTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX3VpU291cmNlQ29kZXNbdWlTb3VyY2VDb2RlLnVyaSgp XTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0yMzIsNyArMjY1LDcgQEAgV2ViSW5zcGVjdG9yLk5h dmlnYXRvclZpZXcucHJvdG90eXBlID0gewogICAgICAqLwogICAgIHJlbmFtZTogZnVuY3Rpb24o dWlTb3VyY2VDb2RlLCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIHZhciBzY3JpcHRUcmVlRWxl bWVudCA9IHRoaXMuX3NjcmlwdFRyZWVFbGVtZW50c0J5VUlTb3VyY2VDb2RlLmdldCh1aVNvdXJj ZUNvZGUpOworICAgICAgICB2YXIgc2NyaXB0VHJlZUVsZW1lbnQgPSB0aGlzLl9nZXRTY3JpcHRU cmVlRWxlbWVudFt1aVNvdXJjZUNvZGUudXJpKCldOwogICAgICAgICBpZiAoIXNjcmlwdFRyZWVF bGVtZW50KQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0yNzgsNyArMzExLDkgQEAgV2ViSW5z cGVjdG9yLk5hdmlnYXRvclZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9zY3JpcHRz VHJlZS5zdG9wU2VhcmNoKCk7CiAgICAgICAgIHRoaXMuX3NjcmlwdHNUcmVlLnJlbW92ZUNoaWxk cmVuKCk7CiAgICAgICAgIHRoaXMuX2ZvbGRlclRyZWVFbGVtZW50cyA9IHt9OwotICAgICAgICB0 aGlzLl9zY3JpcHRUcmVlRWxlbWVudHNCeVVJU291cmNlQ29kZS5jbGVhcigpOworICAgICAgICB0 aGlzLl9mb2xkZXJUcmVlRWxlbWVudHNVSVNvdXJjZUNvZGVzID0ge307CisgICAgICAgIHRoaXMu X3VpU291cmNlQ29kZXMgPSB7fTsKKyAgICAgICAgdGhpcy5fc2NyaXB0VHJlZUVsZW1lbnRzID0g e307CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMjg4LDEzICszMjMsMjggQEAgV2ViSW5zcGVjdG9y Lk5hdmlnYXRvclZpZXcucHJvdG90eXBlID0gewogICAgICAqLwogICAgIGNyZWF0ZUZvbGRlclRy ZWVFbGVtZW50OiBmdW5jdGlvbihwYXJlbnRGb2xkZXJFbGVtZW50LCBmb2xkZXJJZGVudGlmaWVy LCBkb21haW4sIGZvbGRlck5hbWUpCiAgICAgewotICAgICAgICB2YXIgZm9sZGVyVHJlZUVsZW1l bnQgPSBuZXcgV2ViSW5zcGVjdG9yLk5hdmlnYXRvckZvbGRlclRyZWVFbGVtZW50KGZvbGRlcklk ZW50aWZpZXIsIGRvbWFpbiwgZm9sZGVyTmFtZSk7Ci0gICAgICAgIHBhcmVudEZvbGRlckVsZW1l bnQuYXBwZW5kQ2hpbGQoZm9sZGVyVHJlZUVsZW1lbnQpOworICAgICAgICB2YXIgZm9sZGVyVHJl ZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLk5hdmlnYXRvckZvbGRlclRyZWVFbGVtZW50KHRo aXMsIGZvbGRlcklkZW50aWZpZXIsIGRvbWFpbiwgZm9sZGVyTmFtZSk7CiAgICAgICAgIHRoaXMu X2ZvbGRlclRyZWVFbGVtZW50c1tmb2xkZXJJZGVudGlmaWVyXSA9IGZvbGRlclRyZWVFbGVtZW50 OworICAgICAgICB0aGlzLl9mb2xkZXJUcmVlRWxlbWVudHNVSVNvdXJjZUNvZGVzW2ZvbGRlcklk ZW50aWZpZXJdID0gW107CisgICAgICAgIHBhcmVudEZvbGRlckVsZW1lbnQuYXBwZW5kQ2hpbGQo Zm9sZGVyVHJlZUVsZW1lbnQpOwogICAgICAgICByZXR1cm4gZm9sZGVyVHJlZUVsZW1lbnQ7CiAg ICAgfSwKIAogICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLk5hdmlnYXRvckZv bGRlclRyZWVFbGVtZW50fSBmb2xkZXJUcmVlRWxlbWVudAorICAgICAqLworICAgIF9wb3B1bGF0 ZUZvbGRlclRyZWVFbGVtZW50OiBmdW5jdGlvbihmb2xkZXJUcmVlRWxlbWVudCkKKyAgICB7Cisg ICAgICAgIGlmIChmb2xkZXJUcmVlRWxlbWVudC5fcG9wdWxhdGVkKQorICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICBmb2xkZXJUcmVlRWxlbWVudC5fcG9wdWxhdGVkID0gdHJ1ZTsKKyAgICAg ICAgdmFyIHVpU291cmNlQ29kZXMgPSB0aGlzLl9mb2xkZXJUcmVlRWxlbWVudHNVSVNvdXJjZUNv ZGVzW2ZvbGRlclRyZWVFbGVtZW50LmZvbGRlcklkZW50aWZpZXJdOworICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHVpU291cmNlQ29kZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICB0aGlz Ll9hZGRTY3JpcHRUcmVlRWxlbWVudChmb2xkZXJUcmVlRWxlbWVudCwgdWlTb3VyY2VDb2Rlc1tp XSk7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9mb2xkZXJUcmVlRWxlbWVudHNVSVNvdXJjZUNvZGVz W2ZvbGRlclRyZWVFbGVtZW50LmZvbGRlcklkZW50aWZpZXJdOworICAgIH0sCisKKyAgICAvKioK ICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQog ICAgICAqLwogICAgIGdldE9yQ3JlYXRlRm9sZGVyVHJlZUVsZW1lbnQ6IGZ1bmN0aW9uKHVpU291 cmNlQ29kZSkKQEAgLTMyNyw2ICszNzcsMjEgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZpZXcu cHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5jcmVhdGVGb2xkZXJUcmVlRWxlbWVu dChwYXJlbnRGb2xkZXJFbGVtZW50LCBmb2xkZXJJZGVudGlmaWVyLCBkb21haW4sIGZvbGRlck5h bWUpOwogICAgIH0sCiAKKyAgICBfYWRkU2NyaXB0VHJlZUVsZW1lbnQ6IGZ1bmN0aW9uKGZvbGRl clRyZWVFbGVtZW50LCB1aVNvdXJjZUNvZGUpCisgICAgeworICAgICAgICB2YXIgc2NyaXB0VHJl ZUVsZW1lbnQgPSB0aGlzLl9nZXRPckNyZWF0ZVNjcmlwdFRyZWVFbGVtZW50KHVpU291cmNlQ29k ZSk7CisgICAgICAgIGZvbGRlclRyZWVFbGVtZW50LmFwcGVuZENoaWxkKHNjcmlwdFRyZWVFbGVt ZW50KTsKKyAgICB9LAorCisgICAgX2Fkb3B0VUlTb3VyY2VDb2RlOiBmdW5jdGlvbihmb2xkZXJU cmVlRWxlbWVudCwgdWlTb3VyY2VDb2RlKQorICAgIHsKKyAgICAgICAgaWYgKGZvbGRlclRyZWVF bGVtZW50Ll9wb3B1bGF0ZWQgfHwgIWZvbGRlclRyZWVFbGVtZW50LnBhcmVudCkgeworICAgICAg ICAgICAgdGhpcy5fYWRkU2NyaXB0VHJlZUVsZW1lbnQoZm9sZGVyVHJlZUVsZW1lbnQsIHVpU291 cmNlQ29kZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5f Zm9sZGVyVHJlZUVsZW1lbnRzVUlTb3VyY2VDb2Rlc1tmb2xkZXJUcmVlRWxlbWVudC5mb2xkZXJJ ZGVudGlmaWVyXS5wdXNoKHVpU291cmNlQ29kZSk7CisgICAgfSwKKwogICAgIGhhbmRsZUNvbnRl eHRNZW51OiBmdW5jdGlvbihldmVudCwgdWlTb3VyY2VDb2RlKQogICAgIHsKICAgICAgICAgdmFy IGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CkBAIC00 OTksMTIgKzU2NCwxNCBAQCBXZWJJbnNwZWN0b3IuQmFzZU5hdmlnYXRvclRyZWVFbGVtZW50LnBy b3RvdHlwZSA9IHsKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7V2ViSW5zcGVj dG9yLkJhc2VOYXZpZ2F0b3JUcmVlRWxlbWVudH0KKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLk5h dmlnYXRvclZpZXd9IG5hdmlnYXRvclZpZXcKICAqIEBwYXJhbSB7c3RyaW5nfSBmb2xkZXJJZGVu dGlmaWVyCiAgKiBAcGFyYW0ge3N0cmluZ30gZG9tYWluCiAgKiBAcGFyYW0ge3N0cmluZ30gZm9s ZGVyTmFtZQogICovCi1XZWJJbnNwZWN0b3IuTmF2aWdhdG9yRm9sZGVyVHJlZUVsZW1lbnQgPSBm dW5jdGlvbihmb2xkZXJJZGVudGlmaWVyLCBkb21haW4sIGZvbGRlck5hbWUpCitXZWJJbnNwZWN0 b3IuTmF2aWdhdG9yRm9sZGVyVHJlZUVsZW1lbnQgPSBmdW5jdGlvbihuYXZpZ2F0b3JWaWV3LCBm b2xkZXJJZGVudGlmaWVyLCBkb21haW4sIGZvbGRlck5hbWUpCiB7CisgICAgdGhpcy5fbmF2aWdh dG9yVmlldyA9IG5hdmlnYXRvclZpZXc7CiAgICAgdGhpcy5fZm9sZGVySWRlbnRpZmllciA9IGZv bGRlcklkZW50aWZpZXI7CiAgICAgdGhpcy5fZm9sZGVyTmFtZSA9IGZvbGRlck5hbWU7CiAgICAg CkBAIC01MzIsNiArNTk5LDExIEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JGb2xkZXJUcmVlRWxl bWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9mb2xkZXJOYW1lID09PSAi IjsKICAgICB9LAogICAgIAorICAgIG9ucG9wdWxhdGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIHRoaXMuX25hdmlnYXRvclZpZXcuX3BvcHVsYXRlRm9sZGVyVHJlZUVsZW1lbnQodGhpcyk7 CisgICAgfSwKKwogICAgIG9uYXR0YWNoOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBXZWJJ bnNwZWN0b3IuQmFzZU5hdmlnYXRvclRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaC5jYWxs KHRoaXMpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCmluZGV4IDVlNDZmYmMwMjNiMzFkMzY4MjI1YzU0ZTUzNGE0ZjFiOTU5M2M2NTgu LjA4NmI1NDJhOTUyYjk0MTRlMjc0NmQxMjlkZWRjNTYxMmI0MGNiYWEgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxOCBAQAorMjAxMy0wMi0wMSAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9y Zz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBOYXZpZ2F0b3Igc2hvdWxkIG5vdCBjcmVhdGUg dHJlZSBlbGVtZW50cyBmb3IgdWlTb3VyY2VDb2RlcyB1bmxlc3MgbmVlZGVkbSBzaG91bGQgcG9w dWxhdGUgZm9sZGVycyBvbiBleHBhbmQgb25seS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODYwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVz dC5qczoKKyAgICAgICAgKGluaXRpYWxpemVfRGVidWdnZXJUZXN0Lik6CisgICAgICAgIChpbml0 aWFsaXplX0RlYnVnZ2VyVGVzdCk6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3Njcmlw dHMtZmlsZS1zZWxlY3Rvci1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVn Z2VyL3NjcmlwdHMtZmlsZS1zZWxlY3Rvci5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1 Z2dlci9zY3JpcHRzLXNvcnRpbmctZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9k ZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmcuaHRtbDoKKwogMjAxMy0wMi0wMSAgTWlobmVhIE92aWRl bmllICA8bWlobmVhQGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIFJlZ2lvbnNdIENvbnZlcnQg ZmFzdC9yZWdpb25zL3JlZ2lvbi1vdmVyZmxvdy1hdXRvLW92ZXJmbG93KiB0byByZWZ0ZXN0cwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVz dC5qcyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMK aW5kZXggODY1ZWIyMjQxYWY2YTFkYWQ4NDhiNTY2NTdkMzZkYjQzZDMxZmMyNi4uZDVhNmY5NjEw NWZiY2Q3YTcwYjA4ZmM3ZjZiOTIyZTk0YTFiYjZlOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5qcworKysgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzCkBAIC0yMDQsMjAgKzIwNCw2IEBA IEluc3BlY3RvclRlc3QuZHVtcFNjcmlwdHNOYXZpZ2F0b3IgPSBmdW5jdGlvbihuYXZpZ2F0b3Ip CiAgICAgfQogfTsKIAotSW5zcGVjdG9yVGVzdC5kdW1wQ29tYm9Cb3hGaWxlU2VsZWN0b3IgPSBm dW5jdGlvbihjb21ib0JveEZpbGVTZWxlY3RvcikKLXsKLSAgICB2YXIgcm9vdFVSTCA9ICJodHRw Oi8vbG9jYWxob3N0OjgwODAvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLyI7Ci0gICAg SW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIkR1bXBpbmcgQ29tYm9Cb3hGaWxlU2VsZWN0b3I6Iik7 Ci0gICAgdmFyIHNlbGVjdCA9IGNvbWJvQm94RmlsZVNlbGVjdG9yLl9maWxlc1NlbGVjdEVsZW1l bnQ7Ci0gICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzZWxlY3QubGVuZ3RoOyArK2kpIHsKLSAgICAg ICAgdmFyIG9wdGlvbiA9IHNlbGVjdFtpXTsKLSAgICAgICAgdmFyIHRleHQgPSBvcHRpb24udGV4 dC5yZXBsYWNlKC8uKkxheW91dFRlc3RzLywgIkxheW91dFRlc3RzIik7Ci0gICAgICAgIHRleHQg PSB0ZXh0LnJlcGxhY2UoL1x1MDBhMC9nLCAiICIpLnJlcGxhY2UoL1x1MjAyNi9nLCAiLi4uIik7 Ci0gICAgICAgIHZhciB0b29sdGlwID0gb3B0aW9uLnRpdGxlLnJlcGxhY2Uocm9vdFVSTCwgIjxy b290Pi8iKTsKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQodGV4dCArICh0b29sdGlw ID8gIigiICsgdG9vbHRpcCArICIpIiA6ICIiKSk7Ci0gICAgfQotfTsKLQogSW5zcGVjdG9yVGVz dC5zZXRCcmVha3BvaW50ID0gZnVuY3Rpb24oc291cmNlRnJhbWUsIGxpbmVOdW1iZXIsIGNvbmRp dGlvbiwgZW5hYmxlZCkKIHsKICAgICBzb3VyY2VGcmFtZS5fc2V0QnJlYWtwb2ludChsaW5lTnVt YmVyLCBjb25kaXRpb24sIGVuYWJsZWQpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyL3NjcmlwdHMtZmlsZS1zZWxlY3Rvci1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1maWxlLXNlbGVjdG9yLWV4cGVjdGVkLnR4 dAppbmRleCBmZWMyN2FlNGE5N2NiOWJhMWQwNDU4OTI5YWZmYzNlODc4Mjk4OTMyLi43MDA0ZDFk NzkzOWVhYmZlNGFmYmViMDllNGM2ZjQ5MTg1ZjhjYTliIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1maWxlLXNlbGVjdG9yLWV4cGVjdGVkLnR4dAor KysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1maWxlLXNlbGVjdG9y LWV4cGVjdGVkLnR4dApAQCAtMiw2ICsyLDE2IEBAIFRlc3RzIHNjcmlwdHMgcGFuZWwgZmlsZSBz ZWxlY3RvcnMuCiAKIER1bXBpbmcgU2NyaXB0c05hdmlnYXRvciAnU2NyaXB0cycgdGFiOgogICBl eGFtcGxlLmNvbQorICBsb2NhbGhvc3QKKyAgICBMYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdn ZXIvZm9vL2JhcgorICAgIExheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9mb28vYmF6Cisg ID9hPWIKKyAgdmVyeV9sb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vbmdfdXJs CitEdW1waW5nIFNjcmlwdHNOYXZpZ2F0b3IgJ0NvbnRlbnQgc2NyaXB0cycgdGFiOgorICBsb2Nh bGhvc3QKKyAgICBMYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZm9vL2JhcgorRHVtcGlu ZyBTY3JpcHRzTmF2aWdhdG9yICdTY3JpcHRzJyB0YWI6CisgIGV4YW1wbGUuY29tCiAgICAgP2E9 YgogICBsb2NhbGhvc3QKICAgICBMYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZm9vL2Jh cgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtZmls ZS1zZWxlY3Rvci5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMt ZmlsZS1zZWxlY3Rvci5odG1sCmluZGV4IDU3MWE2MjZlMmM1YjBiYzg3YzUxYzUyMWNiNDJhNTE3 YzliODk2ZDUuLjY0ZDE2MDRlMjgzNjgxNTUzYzcwY2MyMTllNmFmMGIzNmU5NTk4YWUgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLWZpbGUtc2VsZWN0 b3IuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1maWxl LXNlbGVjdG9yLmh0bWwKQEAgLTEwLDEzICsxMCwxNSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICBX ZWJJbnNwZWN0b3IuX2lzTWFjID0gZmFsc2U7CiAKICAgICBXZWJJbnNwZWN0b3Iuc2hvd1BhbmVs KCJzY3JpcHRzIik7Ci0gICAgdmFyIG5hdmlnYXRvckZpbGVTZWxlY3RvciA9IG5ldyBXZWJJbnNw ZWN0b3IuU2NyaXB0c05hdmlnYXRvcigpOworICAgIHZhciBuYXZpZ2F0b3IgPSBuZXcgV2ViSW5z cGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IoKTsKIAorICAgIHZhciB1aVNvdXJjZUNvZGVzID0gW107 CiAgICAgZnVuY3Rpb24gYWRkVUlTb3VyY2VDb2RlKHVybCwgaXNDb250ZW50U2NyaXB0KQogICAg IHsKICAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlKFdlYkluc3BlY3Rvci53b3Jrc3BhY2UsIHVybCwgdXJsLCB1cmwsIFdlYkluc3BlY3Rvci5y ZXNvdXJjZVR5cGVzLlNjcmlwdCwgbnVsbCk7CiAgICAgICAgIHVpU291cmNlQ29kZS5pc0NvbnRl bnRTY3JpcHQgPSBpc0NvbnRlbnRTY3JpcHQ7Ci0gICAgICAgIG5hdmlnYXRvckZpbGVTZWxlY3Rv ci5hZGRVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlKTsKKyAgICAgICAgbmF2aWdhdG9yLmFkZFVJ U291cmNlQ29kZSh1aVNvdXJjZUNvZGUpOworICAgICAgICB1aVNvdXJjZUNvZGVzLnB1c2godWlT b3VyY2VDb2RlKTsKICAgICB9CiAKICAgICB2YXIgcm9vdFVSTCA9ICJodHRwOi8vbG9jYWxob3N0 OjgwODAvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLyI7CkBAIC0zMSw3ICszMywxMCBA QCBmdW5jdGlvbiB0ZXN0KCkKICAgICBhZGRVSVNvdXJjZUNvZGUoIj9hPWIiLCBmYWxzZSk7CiAg ICAgYWRkVUlTb3VyY2VDb2RlKCJ2ZXJ5X2xvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29uZ191cmwiLCBmYWxzZSk7CiAKLSAgICBJbnNwZWN0b3JUZXN0LmR1bXBTY3JpcHRzTmF2 aWdhdG9yKG5hdmlnYXRvckZpbGVTZWxlY3Rvcik7CisgICAgSW5zcGVjdG9yVGVzdC5kdW1wU2Ny aXB0c05hdmlnYXRvcihuYXZpZ2F0b3IpOworICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdWlTb3Vy Y2VDb2Rlcy5sZW5ndGg7ICsraSkKKyAgICAgICAgbmF2aWdhdG9yLnJldmVhbFVJU291cmNlQ29k ZSh1aVNvdXJjZUNvZGVzW2ldKTsKKyAgICBJbnNwZWN0b3JUZXN0LmR1bXBTY3JpcHRzTmF2aWdh dG9yKG5hdmlnYXRvcik7CiAKICAgICBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdCgpOwogfQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtc29ydGlu Zy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1z b3J0aW5nLWV4cGVjdGVkLnR4dAppbmRleCBhOWYyYWRhYjVkNTg1Njg1OTljZDI1ZTliMDM3MTBl ZTZiOWJjOWViLi4yZjUzYTNkNjI4YjY3NTljMWU0N2RmZjIyY2MzNWZjNmRkY2I3ZmE1IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1zb3J0aW5nLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1z b3J0aW5nLWV4cGVjdGVkLnR4dApAQCAtNSw2ICs1LDE5IEBAIFdlYkluc3BlY3Rvci5zZXR0aW5n cy5zaG93U2NyaXB0Rm9sZGVycyA9IHRydWUKIER1bXBpbmcgU2NyaXB0c05hdmlnYXRvciAnU2Ny aXB0cycgdGFiOgogICBiYXIuY29tCiAgICAgZm9vL3BhdGgKKyAgZm9vLmNvbQorICAgIF9qcy9w cm9kdWN0aW9uCisgICAgZm9vL3BhdGgKKyAgICBpCisgICAgaS9qcworICAqTm9uKlVSTCpwYXRo CitEdW1waW5nIFNjcmlwdHNOYXZpZ2F0b3IgJ0NvbnRlbnQgc2NyaXB0cycgdGFiOgorICBleHRl bnNpb24tbmFtZQorICAgIGZvbGRlcgorICAqTm9uKlVSTCpwYXRoCitEdW1waW5nIFNjcmlwdHNO YXZpZ2F0b3IgJ1NjcmlwdHMnIHRhYjoKKyAgYmFyLmNvbQorICAgIGZvby9wYXRoCiAgICAgICBi YXIuanM/ZmlsZT1iYXIvenp6LmpzCiAgICAgICBmb28uanM/ZmlsZT1iYXIvYWFhLmpzCiAgIGZv by5jb20KQEAgLTU2LDYgKzY5LDE5IEBAIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93U2NyaXB0 Rm9sZGVycyA9IHRydWUKIER1bXBpbmcgU2NyaXB0c05hdmlnYXRvciAnU2NyaXB0cycgdGFiOgog ICBiYXIuY29tCiAgICAgZm9vL3BhdGgKKyAgZm9vLmNvbQorICAgIF9qcy9wcm9kdWN0aW9uCisg ICAgZm9vL3BhdGgKKyAgICBpCisgICAgaS9qcworICAqTm9uKlVSTCpwYXRoCitEdW1waW5nIFNj cmlwdHNOYXZpZ2F0b3IgJ0NvbnRlbnQgc2NyaXB0cycgdGFiOgorICBleHRlbnNpb24tbmFtZQor ICAgIGZvbGRlcgorICAqTm9uKlVSTCpwYXRoCitEdW1waW5nIFNjcmlwdHNOYXZpZ2F0b3IgJ1Nj cmlwdHMnIHRhYjoKKyAgYmFyLmNvbQorICAgIGZvby9wYXRoCiAgICAgICBiYXIuanM/ZmlsZT1i YXIvenp6LmpzCiAgICAgICBmb28uanM/ZmlsZT1iYXIvYWFhLmpzCiAgIGZvby5jb20KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmcuaHRt bCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmcuaHRtbApp bmRleCBmZTUxZDY3ZWVkNDVlMmFiMGI5MjM1MTJlNDY2ZjU5MGJlOWJhNjI1Li44ODBlOGQ4NzQw YzhiNmM3ZmNkNjgwNTg0MmJiYjU5NjZiMmFkMDJjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1zb3J0aW5nLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtc29ydGluZy5odG1sCkBAIC0xMCwyMSArMTAsMjgg QEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgV2ViSW5zcGVjdG9yLl9pc01hYyA9IGZhbHNlOwogICAg IFdlYkluc3BlY3Rvci5zaG93UGFuZWwoInNjcmlwdHMiKTsKIAotICAgIHZhciBuYXZpZ2F0b3JG aWxlU2VsZWN0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IoKTsKKyAgICB2 YXIgbmF2aWdhdG9yID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yKCk7CiAKKyAg ICB2YXIgdWlTb3VyY2VDb2RlcyA9IFtdOwogICAgIGZ1bmN0aW9uIGFkZFVJU291cmNlQ29kZSh1 cmwsIGlzQ29udGVudFNjcmlwdCkKICAgICB7CiAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBu ZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZShXZWJJbnNwZWN0b3Iud29ya3NwYWNlLCB1cmws IHVybCwgdXJsLCBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TY3JpcHQsIG51bGwpOwogICAg ICAgICB1aVNvdXJjZUNvZGUuaXNDb250ZW50U2NyaXB0ID0gaXNDb250ZW50U2NyaXB0OwotICAg ICAgICBuYXZpZ2F0b3JGaWxlU2VsZWN0b3IuYWRkVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSk7 CisgICAgICAgIG5hdmlnYXRvci5hZGRVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlKTsKKyAgICAg ICAgdWlTb3VyY2VDb2Rlcy5wdXNoKHVpU291cmNlQ29kZSk7CiAgICAgfQogCi0gICAgZnVuY3Rp b24gZHVtcFNjcmlwdHNMaXN0KCkKKyAgICBmdW5jdGlvbiBkdW1wU2NyaXB0c0xpc3Qobm9SZXZl YWwpCiAgICAgewogICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiIik7CiAgICAgICAg IEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hvd1Njcmlw dEZvbGRlcnMgPSAiICsgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnNob3dTY3JpcHRGb2xkZXJzLmdl dCgpKTsKIAotICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBTY3JpcHRzTmF2aWdhdG9yKG5hdmln YXRvckZpbGVTZWxlY3Rvcik7CisgICAgICAgIEluc3BlY3RvclRlc3QuZHVtcFNjcmlwdHNOYXZp Z2F0b3IobmF2aWdhdG9yKTsKKyAgICAgICAgaWYgKG5vUmV2ZWFsKQorICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHVpU291cmNlQ29kZXMubGVuZ3RoOyAr K2kpCisgICAgICAgICAgICBuYXZpZ2F0b3IucmV2ZWFsVUlTb3VyY2VDb2RlKHVpU291cmNlQ29k ZXNbaV0pOworICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBTY3JpcHRzTmF2aWdhdG9yKG5hdmln YXRvcik7CiAgICAgfQogCiAgICAgdmFyIHNjcmlwdHMgPSBbCkBAIC01OSw3ICs2Niw3IEBAIGZ1 bmN0aW9uIHRlc3QoKQogICAgIHRyeSB7CiAgICAgICAgIGR1bXBTY3JpcHRzTGlzdCgpOwogICAg ICAgICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hvd1NjcmlwdEZvbGRlcnMuc2V0KGZhbHNlKTsK LSAgICAgICAgZHVtcFNjcmlwdHNMaXN0KCk7CisgICAgICAgIGR1bXBTY3JpcHRzTGlzdCh0cnVl KTsKICAgICB9IGZpbmFsbHkgewogICAgICAgICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hvd1Nj cmlwdEZvbGRlcnMuc2V0KHRydWUpOwogICAgIH0K