112695 2013-03-19 06:47:50 -0700 Web Inspector: Make workingCopy() and isDirty() methods of UISourceCode to be lazy 2014-03-10 16:30:03 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 116924 1 lushnikov lushnikov apavlov bburg buildbot dglazkov keishi loislo pfeldman pmuellr rniwa vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 858230 0 lushnikov 2013-03-19 06:47:50 -0700 Make UISourceCode.workingCopy() and UISourceCode.isDirty() methods of UISourceCode to be lazy. 858241 1 193816 lushnikov 2013-03-19 06:55:50 -0700 Created attachment 193816 Patch 858254 2 193820 lushnikov 2013-03-19 07:13:41 -0700 Created attachment 193820 Patch 858296 3 193820 buildbot 2013-03-19 08:10:23 -0700 Comment on attachment 193820 Patch Attachment 193820 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-commit-queue.appspot.com/results/17246019 New failing tests: inspector/debugger/script-formatter-console.html inspector/styles/edit-inspector-stylesheet.html 858310 4 193820 webkit.review.bot 2013-03-19 08:30:16 -0700 Comment on attachment 193820 Patch Attachment 193820 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17227197 New failing tests: inspector/debugger/linkifier.html inspector/debugger/script-formatter-console.html inspector/debugger/script-formatter-breakpoints.html inspector/debugger/live-edit-breakpoints.html inspector/styles/edit-inspector-stylesheet.html 858520 5 193820 buildbot 2013-03-19 11:29:31 -0700 Comment on attachment 193820 Patch Attachment 193820 did not pass mac-ews (mac): Output: http://webkit-commit-queue.appspot.com/results/17247067 New failing tests: inspector/debugger/script-formatter-console.html inspector/styles/edit-inspector-stylesheet.html inspector/debugger/script-formatter-breakpoints.html 864277 6 193820 vsevik 2013-03-27 01:00:46 -0700 Comment on attachment 193820 Patch This needs some more work. Clearing r? for now. 193816 2013-03-19 06:55:50 -0700 2013-03-19 07:13:35 -0700 Patch bug-112695-20130319175140.patch text/plain 14837 lushnikov U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTVkNTIxZmIwMDliOTNi MDdiZjdlMjNiYTNkZWQzNDYwYjM1NDA0Ny4uZDQ5MGY1Nzk0MGFkMDE4YmUyMTliYzUzZGEyZGFh MWU5NWZlYjBhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU4IEBACiAyMDEzLTAzLTE5ICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5z cGVjdG9yOiBNYWtlIHdvcmtpbmdDb3B5KCkgYW5kIGlzRGlydHkoKSBtZXRob2RzIG9mIFVJU291 cmNlQ29kZSB0byBiZSBsYXp5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTI2OTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAtIEFkZCBVSVNvdXJjZUNvZGUuTGF6eVdvcmtpbmdDb3B5UHJvdmlkZXIgaW50 ZXJmYWNlCisgICAgICAgIC0gQWRkIFVJU291cmNlQ29kZSBzZXR0ZXJzIGFuZCBnZXR0ZXJzIGZv ciBsYXp5IHdvcmtpbmcgY29weSBwcm92aWRlcgorICAgICAgICAtIE1ha2UgVUlTb3VyY2VDb2Rl LndvcmtpbmdDb3B5KCkgYW5kIFVJU291cmNlQ29kZS5pc0RpcnR5KCkgbWV0aG9kcworICAgICAg ICB0byBvcHRpb25hbGx5IHF1ZXJ5IGxhenlXb3JraW5nQ29weVByb3ZpZGVyIGlmIGFueQorICAg ICAgICAtIEFkZCBUZXh0RWRpdG9yLmlzQ2xlYW4oKSBhbmQgVGV4dEVkaXRvci5tYXJrQ2xlYW4o KSBtZXRob2RzIGFuZAorICAgICAgICBpbXBsZW1lbnQgdGhlbSBpbiBDb2RlTWlycm9yVGV4dEVk aXRvciBhbmQgRGVmYXVsdFRleHRFZGl0b3IKKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvZGVNaXJyb3JUZXh0RWRpdG9yLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvZGVNaXJyb3JUZXh0RWRpdG9yLnByb3RvdHlwZS5pc0NsZWFu KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db2RlTWlycm9yVGV4dEVkaXRvci5wcm90b3R5cGUu bWFya0NsZWFuKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRp dG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlZmF1bHRUZXh0RWRpdG9yLnByb3RvdHlw ZS5pc0NsZWFuKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWZhdWx0VGV4dEVkaXRvci5wcm90 b3R5cGUubWFya0NsZWFuKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0 b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUuaXNDbGVh bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUubWFya0NsZWFu KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwuZW5kc1dpdGhCcmFja2V0UmVnZXgu KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJ U291cmNlQ29kZS5wcm90b3R5cGUuc2V0TGF6eVdvcmtpbmdDb3B5UHJvdmlkZXIpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUucmVtb3ZlTGF6eVdvcmtpbmdD b3B5UHJvdmlkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5 cGUuX2NvbW1pdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5w cm90b3R5cGUud29ya2luZ0NvcHkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZS5wcm90b3R5cGUubm90aWZ5V29ya2luZ0NvcHlDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlLnNldFdvcmtpbmdDb3B5KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlLmNvbW1pdFdvcmtpbmdDb3B5KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlLmlzRGlydHkpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5MYXp5V29ya2luZ0NvcHlQcm92aWRlcik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkxhenlXb3JraW5nQ29weVByb3Zp ZGVyLndvcmtpbmdDb3B5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuTGF6 eVdvcmtpbmdDb3B5UHJvdmlkZXIuaXNEaXJ0eSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9VSVNvdXJjZUNvZGVGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJj ZUNvZGVGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJv dG90eXBlLndhc1Nob3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFt ZS5wcm90b3R5cGUud2lsbEhpZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZUZyYW1lLnByb3RvdHlwZS5jb21taXRFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUub25UZXh0Q2hhbmdlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlLl9vbldvcmtpbmdDb3B5Q2hhbmdl ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlLl9v bldvcmtpbmdDb3B5Q29tbWl0dGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGVGcmFtZS5wcm90b3R5cGUuX2lubmVyU2V0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlRnJhbWUuVGV4dEVkaXRvcldvcmtpbmdDb3B5UHJvdmlkZXIpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUZyYW1lLlRleHRFZGl0b3JXb3JraW5nQ29w eVByb3ZpZGVyLnByb3RvdHlwZS53b3JraW5nQ29weSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VUlTb3VyY2VDb2RlRnJhbWUuVGV4dEVkaXRvcldvcmtpbmdDb3B5UHJvdmlkZXIucHJvdG90eXBl LmlzRGlydHkpOgorCisyMDEzLTAzLTE5ICBBbmRyZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNo cm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbQ29kZU1pcnJvcl0gYWRkIHNt YXJ0IGJyYWNlcyBmdW5jdGlvbmFsaXR5CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTIxMzgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db2RlTWlycm9yVGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQ29kZU1pcnJvclRleHRFZGl0b3IuanMKaW5kZXggMzBjMzJl ODNkM2I5ZWU0NGE2Mzc3YWZkNWQ5YmFkOWE0NGRlMzBmYS4uNDAyYjIwNzFjYTc4MDMzMTdjZTBl ZGM4NzJjZjc3MjU4ZTQ1NmY0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db2RlTWlycm9yVGV4dEVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0NvZGVNaXJyb3JUZXh0RWRpdG9yLmpzCkBAIC04Niw2ICs4Niwx OSBAQCBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRleHRFZGl0b3IgPSBmdW5jdGlvbih1cmwsIGRl bGVnYXRlKQogCiBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRleHRFZGl0b3IucHJvdG90eXBlID0g ewogICAgIC8qKgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisgICAgaXNDbGVh bjogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2NvZGVNaXJyb3IuaXND bGVhbigpOworICAgIH0sCisKKyAgICBtYXJrQ2xlYW46IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIHRoaXMuX2NvZGVNaXJyb3IubWFya0NsZWFuKCk7CisgICAgfSwKKworICAgIC8qKgogICAg ICAqIEBwYXJhbSB7c3RyaW5nfSBtaW1lVHlwZQogICAgICAqLwogICAgIHNldCBtaW1lVHlwZSht aW1lVHlwZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RGVmYXVsdFRleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RlZmF1bHRUZXh0RWRpdG9yLmpzCmluZGV4IGZhN2YyMjA0ZmY3MmJkZGI0OTNmNTc4ODA0ZDc1 MDQzZDQ5MDUxZmEuLmVmZGQzYmVlNWRiODNjYmZmNzUzMWE3OGI4YTJlOWJkOTg5MzE4NmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRF ZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0 VGV4dEVkaXRvci5qcwpAQCAtMTExLDYgKzExMSwxOCBAQCBXZWJJbnNwZWN0b3IuRGVmYXVsdFRl eHRFZGl0b3IuRWRpdEluZm8gPSBmdW5jdGlvbihyYW5nZSwgdGV4dCkKIAogV2ViSW5zcGVjdG9y LkRlZmF1bHRUZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAvKioKKyAgICAgKiBAcmV0dXJu IHtib29sZWFufQorICAgICAqLworICAgIGlzQ2xlYW46IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIHJldHVybiB0aGlzLl90ZXh0TW9kZWwuaXNDbGVhbigpOworICAgIH0sCisKKyAgICBtYXJr Q2xlYW46IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3RleHRNb2RlbC5tYXJrQ2xl YW4oKTsKKyAgICB9LAorICAgIC8qKgogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlRleHRS YW5nZX0gcmFuZ2UKICAgICAgKiBAcmV0dXJuIHtzdHJpbmd9CiAgICAgICovCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3IuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3IuanMKaW5kZXggOWJhNGY5 YzQyNmZiMDMzMjJkMTJhOGIyNjNhMGQ1ZjUwYzUxOGZmNS4uOWI5Y2U4OTE4Zjc1NGIyMDJiOTNk NjZiYzQ4ZmU4YWIzMGEzMzc4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9UZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGV4dEVkaXRvci5qcwpAQCAtMzksNyArMzksMTIgQEAgV2ViSW5zcGVjdG9yLlRl eHRFZGl0b3IuRXZlbnRzID0gewogfTsKIAogV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90 eXBlID0geworICAgIC8qKgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisgICAg aXNDbGVhbjogZnVuY3Rpb24oKSB7IH0sCiAKKyAgICBtYXJrQ2xlYW46IGZ1bmN0aW9uKCkgeyB9 LAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBtaW1lVHlwZQogICAgICAqLwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9yTW9k ZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2Rl bC5qcwppbmRleCAwYWNjNGE5Mjc1ZTk0OTg2ZjExZDdjMzgyNWM5YjVlODY4ZjU0ZjhmLi5hMjVi NTMzYzQ2NWEyNzQwNjBhMmMyNjNmZDUxMTE4YjQ4YTIxNWZjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcwpAQCAtMjAw LDYgKzIwMCwxNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsLmVuZHNXaXRoQnJhY2tl dFJlZ2V4ID0gL1t7KFxbXVxzKiQvOwogCiBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsLnBy b3RvdHlwZSA9IHsKICAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtib29sZWFufQorICAgICAqLwor ICAgIGlzQ2xlYW46IGZ1bmN0aW9uKCkgeworICAgICAgICByZXR1cm4gIXRoaXMuX3VuZG9TdGFj ay5sZW5ndGg7CisgICAgfSwKKworICAgIG1hcmtDbGVhbjogZnVuY3Rpb24oKSB7CisgICAgICAg IHRoaXMuX3Jlc2V0VW5kb1N0YWNrKCk7CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEByZXR1 cm4ge251bWJlcn0KICAgICAgKi8KICAgICBnZXQgbGluZXNDb3VudCgpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCmluZGV4IDZhZDY5 YmZhNTE5MTFlODZjNjc4NjA3ODQ2OWFiOTUxZDgyMDkyODAuLmFkN2MzOTg3MGI0NWNmMDg0OWVk Njg2OThkZjliYjI5YWM5MzhiYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCkBAIC01Niw3ICs1Niw3IEBAIFdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGUgPSBmdW5jdGlvbihwcm9qZWN0LCBwYXRoLCBvcmlnaW5VUkwsIHVybCwg Y29udGVudFR5cGUsCiAgICAgICogQHR5cGUge0FycmF5LjxXZWJJbnNwZWN0b3IuUHJlc2VudGF0 aW9uQ29uc29sZU1lc3NhZ2U+fQogICAgICAqLwogICAgIHRoaXMuX2NvbnNvbGVNZXNzYWdlcyA9 IFtdOwotICAgIAorCiAgICAgLyoqCiAgICAgICogQHR5cGUge0FycmF5LjxXZWJJbnNwZWN0b3Iu UmV2aXNpb24+fQogICAgICAqLwpAQCAtNzgsNiArNzgsMjMgQEAgV2ViSW5zcGVjdG9yLlVJU291 cmNlQ29kZS5FdmVudHMgPSB7CiB9CiAKIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90 eXBlID0geworCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlLkxhenlXb3JraW5nQ29weVByb3ZpZGVyfSBsYXp5V29ya2luZ0NvcHlQcm92aWRlcgorICAg ICAqLworICAgIHNldExhenlXb3JraW5nQ29weVByb3ZpZGVyOiBmdW5jdGlvbihsYXp5V29ya2lu Z0NvcHlQcm92aWRlcikKKyAgICB7CisgICAgICAgIHRoaXMuX2xhenlXb3JraW5nQ29weVByb3Zp ZGVyID0gbGF6eVdvcmtpbmdDb3B5UHJvdmlkZXI7CisgICAgfSwKKworICAgIHJlbW92ZUxhenlX b3JraW5nQ29weVByb3ZpZGVyOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAodGhpcy5f bGF6eVdvcmtpbmdDb3B5UHJvdmlkZXIpIHsKKyAgICAgICAgICAgIHRoaXMuX3dvcmtpbmdDb3B5 ID0gdGhpcy5fbGF6eVdvcmtpbmdDb3B5UHJvdmlkZXIud29ya2luZ0NvcHkoKTsKKyAgICAgICAg ICAgIGRlbGV0ZSB0aGlzLl9sYXp5V29ya2luZ0NvcHlQcm92aWRlcjsKKyAgICAgICAgfQorICAg IH0sCisKICAgICAvKioKICAgICAgKiBAcmV0dXJuIHtzdHJpbmd9CiAgICAgICovCkBAIC0yNjUs NyArMjgyLDcgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAg ewogICAgICAgICB0aGlzLl9jb250ZW50ID0gY29udGVudDsKICAgICAgICAgdGhpcy5fY29udGVu dExvYWRlZCA9IHRydWU7Ci0gICAgICAgIAorCiAgICAgICAgIHZhciBsYXN0UmV2aXNpb24gPSB0 aGlzLmhpc3RvcnkubGVuZ3RoID8gdGhpcy5oaXN0b3J5W3RoaXMuaGlzdG9yeS5sZW5ndGggLSAx XSA6IG51bGw7CiAgICAgICAgIGlmICghbGFzdFJldmlzaW9uIHx8IGxhc3RSZXZpc2lvbi5fY29u dGVudCAhPT0gdGhpcy5fY29udGVudCkgewogICAgICAgICAgICAgdmFyIHJldmlzaW9uID0gbmV3 IFdlYkluc3BlY3Rvci5SZXZpc2lvbih0aGlzLCB0aGlzLl9jb250ZW50LCBuZXcgRGF0ZSgpKTsK QEAgLTM5MiwyNCArNDA5LDMyIEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBl ID0gewogICAgICAqLwogICAgIHdvcmtpbmdDb3B5OiBmdW5jdGlvbigpCiAgICAgeworICAgICAg ICBpZiAodGhpcy5fbGF6eVdvcmtpbmdDb3B5UHJvdmlkZXIgJiYgdGhpcy5fbGF6eVdvcmtpbmdD b3B5UHJvdmlkZXIuaXNEaXJ0eSgpKQorICAgICAgICAgICAgdGhpcy5fd29ya2luZ0NvcHkgPSB0 aGlzLl9sYXp5V29ya2luZ0NvcHlQcm92aWRlci53b3JraW5nQ29weSgpOwogICAgICAgICBpZiAo dGhpcy5pc0RpcnR5KCkpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5fd29ya2luZ0NvcHk7CiAg ICAgICAgIHJldHVybiB0aGlzLl9jb250ZW50OwogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBA cGFyYW0ge2Jvb2xlYW59IHdhc0RpcnR5CisgICAgICovCisgICAgbm90aWZ5V29ya2luZ0NvcHlD aGFuZ2VkOiBmdW5jdGlvbih3YXNEaXJ0eSkgeworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Xb3JraW5nQ29weUNo YW5nZWQsIHt3YXNEaXJ0eTogd2FzRGlydHl9KTsKKyAgICB9LAorCisgICAgLyoqCiAgICAgICog QHBhcmFtIHtzdHJpbmd9IG5ld1dvcmtpbmdDb3B5CiAgICAgICovCiAgICAgc2V0V29ya2luZ0Nv cHk6IGZ1bmN0aW9uKG5ld1dvcmtpbmdDb3B5KQogICAgIHsKLSAgICAgICAgdmFyIHdhc0RpcnR5 ID0gdGhpcy5pc0RpcnR5KCk7ICAgICAgICAKKyAgICAgICAgdmFyIHdhc0RpcnR5ID0gdGhpcy5p c0RpcnR5KCk7CiAgICAgICAgIHRoaXMuX21pbWVUeXBlID0gdGhpcy5jYW5vbmljYWxNaW1lVHlw ZSgpOwotICAgICAgICB2YXIgb2xkV29ya2luZ0NvcHkgPSB0aGlzLl93b3JraW5nQ29weTsKICAg ICAgICAgaWYgKHRoaXMuX2NvbnRlbnQgPT09IG5ld1dvcmtpbmdDb3B5KQogICAgICAgICAgICAg ZGVsZXRlIHRoaXMuX3dvcmtpbmdDb3B5OwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB0aGlz Ll93b3JraW5nQ29weSA9IG5ld1dvcmtpbmdDb3B5OwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Xb3JraW5nQ29w eUNoYW5nZWQsIHtvbGRXb3JraW5nQ29weTogb2xkV29ya2luZ0NvcHksIHdvcmtpbmdDb3B5OiB0 aGlzLndvcmtpbmdDb3B5KCksIHdhc0RpcnR5OiB3YXNEaXJ0eX0pOworICAgICAgICB0aGlzLm5v dGlmeVdvcmtpbmdDb3B5Q2hhbmdlZCh3YXNEaXJ0eSk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAt NDIyLDcgKzQ0Nyw3IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fY29tbWl0Q29u dGVudCh0aGlzLl93b3JraW5nQ29weSwgdHJ1ZSk7CisgICAgICAgIHRoaXMuX2NvbW1pdENvbnRl bnQodGhpcy53b3JraW5nQ29weSgpLCB0cnVlKTsKICAgICAgICAgY2FsbGJhY2sobnVsbCk7CiAK ICAgICAgICAgV2ViSW5zcGVjdG9yLm5vdGlmaWNhdGlvbnMuZGlzcGF0Y2hFdmVudFRvTGlzdGVu ZXJzKFdlYkluc3BlY3Rvci5Vc2VyTWV0cmljcy5Vc2VyQWN0aW9uLCB7CkBAIC00MzYsNyArNDYx LDkgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgICovCiAg ICAgaXNEaXJ0eTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHR5cGVvZiB0aGlz Ll93b3JraW5nQ29weSAhPT0gInVuZGVmaW5lZCIgJiYgdGhpcy5fd29ya2luZ0NvcHkgIT09IHRo aXMuX2NvbnRlbnQ7CisgICAgICAgIGlmICh0aGlzLl9sYXp5V29ya2luZ0NvcHlQcm92aWRlcikK KyAgICAgICAgICAgIHJldHVybiB0aGlzLl9sYXp5V29ya2luZ0NvcHlQcm92aWRlci5pc0RpcnR5 KCk7CisgICAgICAgIHJldHVybiAhIXRoaXMuX3dvcmtpbmdDb3B5OwogICAgIH0sCiAKICAgICAv KioKQEAgLTk0MiwzICs5NjksMTkgQEAgV2ViSW5zcGVjdG9yLlJldmlzaW9uLnByb3RvdHlwZSA9 IHsKICAgICAgICAgc2V0VGltZW91dChwZXJzaXN0LmJpbmQodGhpcyksIDApOwogICAgIH0KIH0K KworLyoqCisgKiBAaW50ZXJmYWNlCisgKi8KK1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuTGF6 eVdvcmtpbmdDb3B5UHJvdmlkZXIgPSBmdW5jdGlvbigpIHsgfQorCitXZWJJbnNwZWN0b3IuVUlT b3VyY2VDb2RlLkxhenlXb3JraW5nQ29weVByb3ZpZGVyID0geworICAgIC8qKgorICAgICAqIEBy ZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KKyAgICB3b3JraW5nQ29weTogZnVuY3Rpb24oKSB7IH0s CisgICAgLyoqCisgICAgICogQHJldHVybiB7Ym9vbGVhbn0KKyAgICAgKi8KKyAgICBpc0RpcnR5 OiBmdW5jdGlvbigpIHsgfSwKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZUZyYW1lLmpzCmluZGV4IGM2ZjA0NDc0YTI5YWYwZTk3 MGIyN2YzMTRjODVjMGU0NTBkMTQxNTYuLmM3OGNkNTM0YTE4MGZhOWRlYWQzNjBiMGE0MmJmZmVk NmM5MjdhZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv VUlTb3VyY2VDb2RlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9VSVNvdXJjZUNvZGVGcmFtZS5qcwpAQCAtMzgsNiArMzgsNyBAQCBXZWJJbnNwZWN0b3Iu VUlTb3VyY2VDb2RlRnJhbWUgPSBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAgdGhpcy5fdWlT b3VyY2VDb2RlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVu dHMuRm9ybWF0dGVkQ2hhbmdlZCwgdGhpcy5fb25Gb3JtYXR0ZWRDaGFuZ2VkLCB0aGlzKTsKICAg ICB0aGlzLl91aVNvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlLkV2ZW50cy5Xb3JraW5nQ29weUNoYW5nZWQsIHRoaXMuX29uV29ya2luZ0NvcHlDaGFu Z2VkLCB0aGlzKTsKICAgICB0aGlzLl91aVNvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Xb3JraW5nQ29weUNvbW1pdHRlZCwgdGhpcy5f b25Xb3JraW5nQ29weUNvbW1pdHRlZCwgdGhpcyk7CisgICAgdGhpcy5fd2FzRGlydHkgPSB1aVNv dXJjZUNvZGUuaXNEaXJ0eSgpOwogfQogCiBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUu cHJvdG90eXBlID0gewpAQCAtNDcsNiArNDgsNyBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2Rl RnJhbWUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9ib3VuZFdpbmRvd0ZvY3VzZWQgPSB0 aGlzLl93aW5kb3dGb2N1c2VkLmJpbmQodGhpcyk7CiAgICAgICAgIHdpbmRvdy5hZGRFdmVudExp c3RlbmVyKCJmb2N1cyIsIHRoaXMuX2JvdW5kV2luZG93Rm9jdXNlZCwgZmFsc2UpOwogICAgICAg ICB0aGlzLl9jaGVja0NvbnRlbnRVcGRhdGVkKCk7CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29k ZS5zZXRMYXp5V29ya2luZ0NvcHlQcm92aWRlcihuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZUZyYW1lLlRleHRFZGl0b3JXb3JraW5nQ29weVByb3ZpZGVyKHRoaXMudGV4dEVkaXRvcikpOwog ICAgIH0sCiAKICAgICB3aWxsSGlkZTogZnVuY3Rpb24oKQpAQCAtNTQsNiArNTYsNyBAQCBXZWJJ bnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNw ZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLndpbGxIaWRlLmNhbGwodGhpcyk7CiAgICAgICAg IHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVyKCJmb2N1cyIsIHRoaXMuX2JvdW5kV2luZG93Rm9j dXNlZCwgZmFsc2UpOwogICAgICAgICBkZWxldGUgdGhpcy5fYm91bmRXaW5kb3dGb2N1c2VkOwor ICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGUucmVtb3ZlTGF6eVdvcmtpbmdDb3B5UHJvdmlkZXIo KTsKICAgICB9LAogCiAgICAgLyoqCkBAIC04NSw3ICs4OCw5IEBAIFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGVGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAg ICAgdGhpcy5faXNDb21taXR0aW5nRWRpdGluZyA9IHRydWU7CisgICAgICAgIHRoaXMuX3VpU291 cmNlQ29kZS5yZW1vdmVMYXp5V29ya2luZ0NvcHlQcm92aWRlcigpOwogICAgICAgICB0aGlzLl91 aVNvdXJjZUNvZGUuY29tbWl0V29ya2luZ0NvcHkodGhpcy5fZGlkRWRpdENvbnRlbnQuYmluZCh0 aGlzKSk7CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZS5zZXRMYXp5V29ya2luZ0NvcHlQcm92 aWRlcihuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUZyYW1lLlRleHRFZGl0b3JXb3JraW5n Q29weVByb3ZpZGVyKHRoaXMuX3RleHRFZGl0b3IpKTsKICAgICAgICAgZGVsZXRlIHRoaXMuX2lz Q29tbWl0dGluZ0VkaXRpbmc7CiAgICAgfSwKIApAQCAtOTMsNyArOTgsOCBAQCBXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgV2ViSW5z cGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5vblRleHRDaGFuZ2VkLmNhbGwodGhpcywgb2xk UmFuZ2UsIG5ld1JhbmdlKTsKICAgICAgICAgdGhpcy5faXNTZXR0aW5nV29ya2luZ0NvcHkgPSB0 cnVlOwotICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGUuc2V0V29ya2luZ0NvcHkodGhpcy5fdGV4 dEVkaXRvci50ZXh0KCkpOworICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGUubm90aWZ5V29ya2lu Z0NvcHlDaGFuZ2VkKHRoaXMuX3dhc0RpcnR5KTsKKyAgICAgICAgdGhpcy5fd2FzRGlydHkgPSB0 aGlzLl91aVNvdXJjZUNvZGUuaXNEaXJ0eSgpOwogICAgICAgICBkZWxldGUgdGhpcy5faXNTZXR0 aW5nV29ya2luZ0NvcHk7CiAgICAgfSwKIApAQCAtMTIwLDcgKzEyNiw3IEBAIFdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgX29uV29ya2lu Z0NvcHlDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2lubmVy U2V0Q29udGVudCh0aGlzLl91aVNvdXJjZUNvZGUud29ya2luZ0NvcHkoKSk7CisgICAgICAgIHRo aXMuX2lubmVyU2V0Q29udGVudCgpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTEyOCw3ICsxMzQs OCBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlID0gewogICAgICAq LwogICAgIF9vbldvcmtpbmdDb3B5Q29tbWl0dGVkOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0g ICAgICAgIHRoaXMuX2lubmVyU2V0Q29udGVudCh0aGlzLl91aVNvdXJjZUNvZGUud29ya2luZ0Nv cHkoKSk7CisgICAgICAgIHRoaXMuX3RleHRFZGl0b3IubWFya0NsZWFuKCk7CisgICAgICAgIHRo aXMuX2lubmVyU2V0Q29udGVudCgpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTEzOSwxNCArMTQ2 LDExIEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHRoaXMuc2V0Q29udGVudChjb250ZW50LCBmYWxzZSwgdGhpcy5fdWlTb3VyY2VDb2RlLm1p bWVUeXBlKCkpOwogICAgIH0sCiAKLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gY29u dGVudAotICAgICAqLwotICAgIF9pbm5lclNldENvbnRlbnQ6IGZ1bmN0aW9uKGNvbnRlbnQpCisg ICAgX2lubmVyU2V0Q29udGVudDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMu X2lzU2V0dGluZ1dvcmtpbmdDb3B5IHx8IHRoaXMuX2lzQ29tbWl0dGluZ0VkaXRpbmcpCiAgICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgIHRoaXMub25VSVNvdXJjZUNvZGVDb250ZW50Q2hhbmdl ZChjb250ZW50KTsKKyAgICAgICAgdGhpcy5vblVJU291cmNlQ29kZUNvbnRlbnRDaGFuZ2VkKHRo aXMuX3VpU291cmNlQ29kZS53b3JraW5nQ29weSgpKTsKICAgICB9LAogCiAgICAgcG9wdWxhdGVU ZXh0QXJlYUNvbnRleHRNZW51OiBmdW5jdGlvbihjb250ZXh0TWVudSwgbGluZU51bWJlcikKQEAg LTE2MywzICsxNjcsMzEgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUZyYW1lLnByb3RvdHlw ZSA9IHsKIAogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlw ZQogfQorCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGUuTGF6eVdvcmtpbmdDb3B5UHJvdmlkZXJ9CisgKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5UZXh0RWRpdG9yfSB0ZXh0RWRpdG9yCisgKi8KK1dlYkluc3BlY3Rvci5VSVNvdXJj ZUNvZGVGcmFtZS5UZXh0RWRpdG9yV29ya2luZ0NvcHlQcm92aWRlciA9IGZ1bmN0aW9uKHRleHRF ZGl0b3IpCit7CisgICAgdGhpcy5fdGV4dEVkaXRvciA9IHRleHRFZGl0b3I7Cit9CisKK1dlYklu c3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5UZXh0RWRpdG9yV29ya2luZ0NvcHlQcm92aWRlci5w cm90b3R5cGUgPSB7CisgICAgLyoqCisgICAgICogQHJldHVybiB7c3RyaW5nfQorICAgICAqLwor ICAgIHdvcmtpbmdDb3B5OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5f dGV4dEVkaXRvci50ZXh0KCk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge2Jv b2xlYW59CisgICAgICovCisgICAgaXNEaXJ0eTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAg cmV0dXJuICF0aGlzLl90ZXh0RWRpdG9yLmlzQ2xlYW4oKTsKKyAgICB9Cit9ClwgTm8gbmV3bGlu ZSBhdCBlbmQgb2YgZmlsZQo= 193820 2013-03-19 07:13:41 -0700 2013-03-27 01:00:46 -0700 Patch bug-112695-20130319180930.patch text/plain 14858 lushnikov U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTVkNTIxZmIwMDliOTNi MDdiZjdlMjNiYTNkZWQzNDYwYjM1NDA0Ny4uZDQ5MGY1Nzk0MGFkMDE4YmUyMTliYzUzZGEyZGFh MWU5NWZlYjBhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU4IEBACiAyMDEzLTAzLTE5ICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5z cGVjdG9yOiBNYWtlIHdvcmtpbmdDb3B5KCkgYW5kIGlzRGlydHkoKSBtZXRob2RzIG9mIFVJU291 cmNlQ29kZSB0byBiZSBsYXp5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTI2OTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAtIEFkZCBVSVNvdXJjZUNvZGUuTGF6eVdvcmtpbmdDb3B5UHJvdmlkZXIgaW50 ZXJmYWNlCisgICAgICAgIC0gQWRkIFVJU291cmNlQ29kZSBzZXR0ZXJzIGFuZCBnZXR0ZXJzIGZv ciBsYXp5IHdvcmtpbmcgY29weSBwcm92aWRlcgorICAgICAgICAtIE1ha2UgVUlTb3VyY2VDb2Rl LndvcmtpbmdDb3B5KCkgYW5kIFVJU291cmNlQ29kZS5pc0RpcnR5KCkgbWV0aG9kcworICAgICAg ICB0byBvcHRpb25hbGx5IHF1ZXJ5IGxhenlXb3JraW5nQ29weVByb3ZpZGVyIGlmIGFueQorICAg ICAgICAtIEFkZCBUZXh0RWRpdG9yLmlzQ2xlYW4oKSBhbmQgVGV4dEVkaXRvci5tYXJrQ2xlYW4o KSBtZXRob2RzIGFuZAorICAgICAgICBpbXBsZW1lbnQgdGhlbSBpbiBDb2RlTWlycm9yVGV4dEVk aXRvciBhbmQgRGVmYXVsdFRleHRFZGl0b3IKKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvZGVNaXJyb3JUZXh0RWRpdG9yLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvZGVNaXJyb3JUZXh0RWRpdG9yLnByb3RvdHlwZS5pc0NsZWFu KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db2RlTWlycm9yVGV4dEVkaXRvci5wcm90b3R5cGUu bWFya0NsZWFuKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRp dG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlZmF1bHRUZXh0RWRpdG9yLnByb3RvdHlw ZS5pc0NsZWFuKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWZhdWx0VGV4dEVkaXRvci5wcm90 b3R5cGUubWFya0NsZWFuKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0 b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUuaXNDbGVh bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUubWFya0NsZWFu KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwuZW5kc1dpdGhCcmFja2V0UmVnZXgu KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJ U291cmNlQ29kZS5wcm90b3R5cGUuc2V0TGF6eVdvcmtpbmdDb3B5UHJvdmlkZXIpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUucmVtb3ZlTGF6eVdvcmtpbmdD b3B5UHJvdmlkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5 cGUuX2NvbW1pdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5w cm90b3R5cGUud29ya2luZ0NvcHkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZS5wcm90b3R5cGUubm90aWZ5V29ya2luZ0NvcHlDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlLnNldFdvcmtpbmdDb3B5KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlLmNvbW1pdFdvcmtpbmdDb3B5KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlLmlzRGlydHkpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5MYXp5V29ya2luZ0NvcHlQcm92aWRlcik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkxhenlXb3JraW5nQ29weVByb3Zp ZGVyLndvcmtpbmdDb3B5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuTGF6 eVdvcmtpbmdDb3B5UHJvdmlkZXIuaXNEaXJ0eSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9VSVNvdXJjZUNvZGVGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJj ZUNvZGVGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJv dG90eXBlLndhc1Nob3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFt ZS5wcm90b3R5cGUud2lsbEhpZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZUZyYW1lLnByb3RvdHlwZS5jb21taXRFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUub25UZXh0Q2hhbmdlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlLl9vbldvcmtpbmdDb3B5Q2hhbmdl ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlLl9v bldvcmtpbmdDb3B5Q29tbWl0dGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGVGcmFtZS5wcm90b3R5cGUuX2lubmVyU2V0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlRnJhbWUuVGV4dEVkaXRvcldvcmtpbmdDb3B5UHJvdmlkZXIpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUZyYW1lLlRleHRFZGl0b3JXb3JraW5nQ29w eVByb3ZpZGVyLnByb3RvdHlwZS53b3JraW5nQ29weSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VUlTb3VyY2VDb2RlRnJhbWUuVGV4dEVkaXRvcldvcmtpbmdDb3B5UHJvdmlkZXIucHJvdG90eXBl LmlzRGlydHkpOgorCisyMDEzLTAzLTE5ICBBbmRyZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNo cm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbQ29kZU1pcnJvcl0gYWRkIHNt YXJ0IGJyYWNlcyBmdW5jdGlvbmFsaXR5CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTIxMzgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db2RlTWlycm9yVGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQ29kZU1pcnJvclRleHRFZGl0b3IuanMKaW5kZXggMzBjMzJl ODNkM2I5ZWU0NGE2Mzc3YWZkNWQ5YmFkOWE0NGRlMzBmYS4uNDAyYjIwNzFjYTc4MDMzMTdjZTBl ZGM4NzJjZjc3MjU4ZTQ1NmY0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db2RlTWlycm9yVGV4dEVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0NvZGVNaXJyb3JUZXh0RWRpdG9yLmpzCkBAIC04Niw2ICs4Niwx OSBAQCBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRleHRFZGl0b3IgPSBmdW5jdGlvbih1cmwsIGRl bGVnYXRlKQogCiBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRleHRFZGl0b3IucHJvdG90eXBlID0g ewogICAgIC8qKgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisgICAgaXNDbGVh bjogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2NvZGVNaXJyb3IuaXND bGVhbigpOworICAgIH0sCisKKyAgICBtYXJrQ2xlYW46IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIHRoaXMuX2NvZGVNaXJyb3IubWFya0NsZWFuKCk7CisgICAgfSwKKworICAgIC8qKgogICAg ICAqIEBwYXJhbSB7c3RyaW5nfSBtaW1lVHlwZQogICAgICAqLwogICAgIHNldCBtaW1lVHlwZSht aW1lVHlwZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RGVmYXVsdFRleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RlZmF1bHRUZXh0RWRpdG9yLmpzCmluZGV4IGZhN2YyMjA0ZmY3MmJkZGI0OTNmNTc4ODA0ZDc1 MDQzZDQ5MDUxZmEuLmVmZGQzYmVlNWRiODNjYmZmNzUzMWE3OGI4YTJlOWJkOTg5MzE4NmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRF ZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0 VGV4dEVkaXRvci5qcwpAQCAtMTExLDYgKzExMSwxOCBAQCBXZWJJbnNwZWN0b3IuRGVmYXVsdFRl eHRFZGl0b3IuRWRpdEluZm8gPSBmdW5jdGlvbihyYW5nZSwgdGV4dCkKIAogV2ViSW5zcGVjdG9y LkRlZmF1bHRUZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAvKioKKyAgICAgKiBAcmV0dXJu IHtib29sZWFufQorICAgICAqLworICAgIGlzQ2xlYW46IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIHJldHVybiB0aGlzLl90ZXh0TW9kZWwuaXNDbGVhbigpOworICAgIH0sCisKKyAgICBtYXJr Q2xlYW46IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3RleHRNb2RlbC5tYXJrQ2xl YW4oKTsKKyAgICB9LAorICAgIC8qKgogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlRleHRS YW5nZX0gcmFuZ2UKICAgICAgKiBAcmV0dXJuIHtzdHJpbmd9CiAgICAgICovCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3IuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3IuanMKaW5kZXggOWJhNGY5 YzQyNmZiMDMzMjJkMTJhOGIyNjNhMGQ1ZjUwYzUxOGZmNS4uOWI5Y2U4OTE4Zjc1NGIyMDJiOTNk NjZiYzQ4ZmU4YWIzMGEzMzc4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9UZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGV4dEVkaXRvci5qcwpAQCAtMzksNyArMzksMTIgQEAgV2ViSW5zcGVjdG9yLlRl eHRFZGl0b3IuRXZlbnRzID0gewogfTsKIAogV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90 eXBlID0geworICAgIC8qKgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisgICAg aXNDbGVhbjogZnVuY3Rpb24oKSB7IH0sCiAKKyAgICBtYXJrQ2xlYW46IGZ1bmN0aW9uKCkgeyB9 LAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBtaW1lVHlwZQogICAgICAqLwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9yTW9k ZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2Rl bC5qcwppbmRleCAwYWNjNGE5Mjc1ZTk0OTg2ZjExZDdjMzgyNWM5YjVlODY4ZjU0ZjhmLi5hMjVi NTMzYzQ2NWEyNzQwNjBhMmMyNjNmZDUxMTE4YjQ4YTIxNWZjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcwpAQCAtMjAw LDYgKzIwMCwxNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsLmVuZHNXaXRoQnJhY2tl dFJlZ2V4ID0gL1t7KFxbXVxzKiQvOwogCiBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsLnBy b3RvdHlwZSA9IHsKICAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtib29sZWFufQorICAgICAqLwor ICAgIGlzQ2xlYW46IGZ1bmN0aW9uKCkgeworICAgICAgICByZXR1cm4gIXRoaXMuX3VuZG9TdGFj ay5sZW5ndGg7CisgICAgfSwKKworICAgIG1hcmtDbGVhbjogZnVuY3Rpb24oKSB7CisgICAgICAg IHRoaXMuX3Jlc2V0VW5kb1N0YWNrKCk7CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEByZXR1 cm4ge251bWJlcn0KICAgICAgKi8KICAgICBnZXQgbGluZXNDb3VudCgpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCmluZGV4IDZhZDY5 YmZhNTE5MTFlODZjNjc4NjA3ODQ2OWFiOTUxZDgyMDkyODAuLjM0ZWJkODUxOGI1YWI3YTZiYjlh Y2Y0NWJkNjExZTg1NGI3N2NkZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCkBAIC01Niw3ICs1Niw3IEBAIFdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGUgPSBmdW5jdGlvbihwcm9qZWN0LCBwYXRoLCBvcmlnaW5VUkwsIHVybCwg Y29udGVudFR5cGUsCiAgICAgICogQHR5cGUge0FycmF5LjxXZWJJbnNwZWN0b3IuUHJlc2VudGF0 aW9uQ29uc29sZU1lc3NhZ2U+fQogICAgICAqLwogICAgIHRoaXMuX2NvbnNvbGVNZXNzYWdlcyA9 IFtdOwotICAgIAorCiAgICAgLyoqCiAgICAgICogQHR5cGUge0FycmF5LjxXZWJJbnNwZWN0b3Iu UmV2aXNpb24+fQogICAgICAqLwpAQCAtNzgsNiArNzgsMjMgQEAgV2ViSW5zcGVjdG9yLlVJU291 cmNlQ29kZS5FdmVudHMgPSB7CiB9CiAKIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90 eXBlID0geworCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlLkxhenlXb3JraW5nQ29weVByb3ZpZGVyfSBsYXp5V29ya2luZ0NvcHlQcm92aWRlcgorICAg ICAqLworICAgIHNldExhenlXb3JraW5nQ29weVByb3ZpZGVyOiBmdW5jdGlvbihsYXp5V29ya2lu Z0NvcHlQcm92aWRlcikKKyAgICB7CisgICAgICAgIHRoaXMuX2xhenlXb3JraW5nQ29weVByb3Zp ZGVyID0gbGF6eVdvcmtpbmdDb3B5UHJvdmlkZXI7CisgICAgfSwKKworICAgIHJlbW92ZUxhenlX b3JraW5nQ29weVByb3ZpZGVyOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAodGhpcy5f bGF6eVdvcmtpbmdDb3B5UHJvdmlkZXIpIHsKKyAgICAgICAgICAgIHRoaXMuX3dvcmtpbmdDb3B5 ID0gdGhpcy5fbGF6eVdvcmtpbmdDb3B5UHJvdmlkZXIud29ya2luZ0NvcHkoKTsKKyAgICAgICAg ICAgIGRlbGV0ZSB0aGlzLl9sYXp5V29ya2luZ0NvcHlQcm92aWRlcjsKKyAgICAgICAgfQorICAg IH0sCisKICAgICAvKioKICAgICAgKiBAcmV0dXJuIHtzdHJpbmd9CiAgICAgICovCkBAIC0yNjUs NyArMjgyLDcgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAg ewogICAgICAgICB0aGlzLl9jb250ZW50ID0gY29udGVudDsKICAgICAgICAgdGhpcy5fY29udGVu dExvYWRlZCA9IHRydWU7Ci0gICAgICAgIAorCiAgICAgICAgIHZhciBsYXN0UmV2aXNpb24gPSB0 aGlzLmhpc3RvcnkubGVuZ3RoID8gdGhpcy5oaXN0b3J5W3RoaXMuaGlzdG9yeS5sZW5ndGggLSAx XSA6IG51bGw7CiAgICAgICAgIGlmICghbGFzdFJldmlzaW9uIHx8IGxhc3RSZXZpc2lvbi5fY29u dGVudCAhPT0gdGhpcy5fY29udGVudCkgewogICAgICAgICAgICAgdmFyIHJldmlzaW9uID0gbmV3 IFdlYkluc3BlY3Rvci5SZXZpc2lvbih0aGlzLCB0aGlzLl9jb250ZW50LCBuZXcgRGF0ZSgpKTsK QEAgLTM5MiwyNCArNDA5LDMyIEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBl ID0gewogICAgICAqLwogICAgIHdvcmtpbmdDb3B5OiBmdW5jdGlvbigpCiAgICAgeworICAgICAg ICBpZiAodGhpcy5fbGF6eVdvcmtpbmdDb3B5UHJvdmlkZXIgJiYgdGhpcy5fbGF6eVdvcmtpbmdD b3B5UHJvdmlkZXIuaXNEaXJ0eSgpKQorICAgICAgICAgICAgdGhpcy5fd29ya2luZ0NvcHkgPSB0 aGlzLl9sYXp5V29ya2luZ0NvcHlQcm92aWRlci53b3JraW5nQ29weSgpOwogICAgICAgICBpZiAo dGhpcy5pc0RpcnR5KCkpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5fd29ya2luZ0NvcHk7CiAg ICAgICAgIHJldHVybiB0aGlzLl9jb250ZW50OwogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBA cGFyYW0ge2Jvb2xlYW59IHdhc0RpcnR5CisgICAgICovCisgICAgbm90aWZ5V29ya2luZ0NvcHlD aGFuZ2VkOiBmdW5jdGlvbih3YXNEaXJ0eSkgeworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Xb3JraW5nQ29weUNo YW5nZWQsIHt3YXNEaXJ0eTogd2FzRGlydHl9KTsKKyAgICB9LAorCisgICAgLyoqCiAgICAgICog QHBhcmFtIHtzdHJpbmd9IG5ld1dvcmtpbmdDb3B5CiAgICAgICovCiAgICAgc2V0V29ya2luZ0Nv cHk6IGZ1bmN0aW9uKG5ld1dvcmtpbmdDb3B5KQogICAgIHsKLSAgICAgICAgdmFyIHdhc0RpcnR5 ID0gdGhpcy5pc0RpcnR5KCk7ICAgICAgICAKKyAgICAgICAgdmFyIHdhc0RpcnR5ID0gdGhpcy5p c0RpcnR5KCk7CiAgICAgICAgIHRoaXMuX21pbWVUeXBlID0gdGhpcy5jYW5vbmljYWxNaW1lVHlw ZSgpOwotICAgICAgICB2YXIgb2xkV29ya2luZ0NvcHkgPSB0aGlzLl93b3JraW5nQ29weTsKICAg ICAgICAgaWYgKHRoaXMuX2NvbnRlbnQgPT09IG5ld1dvcmtpbmdDb3B5KQogICAgICAgICAgICAg ZGVsZXRlIHRoaXMuX3dvcmtpbmdDb3B5OwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB0aGlz Ll93b3JraW5nQ29weSA9IG5ld1dvcmtpbmdDb3B5OwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Xb3JraW5nQ29w eUNoYW5nZWQsIHtvbGRXb3JraW5nQ29weTogb2xkV29ya2luZ0NvcHksIHdvcmtpbmdDb3B5OiB0 aGlzLndvcmtpbmdDb3B5KCksIHdhc0RpcnR5OiB3YXNEaXJ0eX0pOworICAgICAgICB0aGlzLm5v dGlmeVdvcmtpbmdDb3B5Q2hhbmdlZCh3YXNEaXJ0eSk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAt NDIyLDcgKzQ0Nyw3IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fY29tbWl0Q29u dGVudCh0aGlzLl93b3JraW5nQ29weSwgdHJ1ZSk7CisgICAgICAgIHRoaXMuX2NvbW1pdENvbnRl bnQodGhpcy53b3JraW5nQ29weSgpLCB0cnVlKTsKICAgICAgICAgY2FsbGJhY2sobnVsbCk7CiAK ICAgICAgICAgV2ViSW5zcGVjdG9yLm5vdGlmaWNhdGlvbnMuZGlzcGF0Y2hFdmVudFRvTGlzdGVu ZXJzKFdlYkluc3BlY3Rvci5Vc2VyTWV0cmljcy5Vc2VyQWN0aW9uLCB7CkBAIC00MzYsNyArNDYx LDkgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgICovCiAg ICAgaXNEaXJ0eTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHR5cGVvZiB0aGlz Ll93b3JraW5nQ29weSAhPT0gInVuZGVmaW5lZCIgJiYgdGhpcy5fd29ya2luZ0NvcHkgIT09IHRo aXMuX2NvbnRlbnQ7CisgICAgICAgIGlmICh0aGlzLl9sYXp5V29ya2luZ0NvcHlQcm92aWRlcikK KyAgICAgICAgICAgIHJldHVybiB0aGlzLl9sYXp5V29ya2luZ0NvcHlQcm92aWRlci5pc0RpcnR5 KCk7CisgICAgICAgIHJldHVybiB0eXBlb2YgdGhpcy5fd29ya2luZ0NvcHkgIT09ICJ1bmRlZmlu ZWQiOwogICAgIH0sCiAKICAgICAvKioKQEAgLTk0MiwzICs5NjksMTkgQEAgV2ViSW5zcGVjdG9y LlJldmlzaW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgc2V0VGltZW91dChwZXJzaXN0LmJpbmQo dGhpcyksIDApOwogICAgIH0KIH0KKworLyoqCisgKiBAaW50ZXJmYWNlCisgKi8KK1dlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGUuTGF6eVdvcmtpbmdDb3B5UHJvdmlkZXIgPSBmdW5jdGlvbigpIHsg fQorCitXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkxhenlXb3JraW5nQ29weVByb3ZpZGVyID0g eworICAgIC8qKgorICAgICAqIEByZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KKyAgICB3b3JraW5n Q29weTogZnVuY3Rpb24oKSB7IH0sCisgICAgLyoqCisgICAgICogQHJldHVybiB7Ym9vbGVhbn0K KyAgICAgKi8KKyAgICBpc0RpcnR5OiBmdW5jdGlvbigpIHsgfSwKK30KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlRnJhbWUuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZUZyYW1lLmpzCmlu ZGV4IGM2ZjA0NDc0YTI5YWYwZTk3MGIyN2YzMTRjODVjMGU0NTBkMTQxNTYuLmM3OGNkNTM0YTE4 MGZhOWRlYWQzNjBiMGE0MmJmZmVkNmM5MjdhZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlRnJhbWUuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGVGcmFtZS5qcwpAQCAtMzgsNiAr MzgsNyBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUgPSBmdW5jdGlvbih1aVNvdXJj ZUNvZGUpCiAgICAgdGhpcy5fdWlTb3VyY2VDb2RlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLlVJU291cmNlQ29kZS5FdmVudHMuRm9ybWF0dGVkQ2hhbmdlZCwgdGhpcy5fb25Gb3JtYXR0 ZWRDaGFuZ2VkLCB0aGlzKTsKICAgICB0aGlzLl91aVNvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Xb3JraW5nQ29weUNoYW5nZWQsIHRo aXMuX29uV29ya2luZ0NvcHlDaGFuZ2VkLCB0aGlzKTsKICAgICB0aGlzLl91aVNvdXJjZUNvZGUu YWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Xb3JraW5n Q29weUNvbW1pdHRlZCwgdGhpcy5fb25Xb3JraW5nQ29weUNvbW1pdHRlZCwgdGhpcyk7CisgICAg dGhpcy5fd2FzRGlydHkgPSB1aVNvdXJjZUNvZGUuaXNEaXJ0eSgpOwogfQogCiBXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlID0gewpAQCAtNDcsNiArNDgsNyBAQCBXZWJJ bnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9i b3VuZFdpbmRvd0ZvY3VzZWQgPSB0aGlzLl93aW5kb3dGb2N1c2VkLmJpbmQodGhpcyk7CiAgICAg ICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJmb2N1cyIsIHRoaXMuX2JvdW5kV2luZG93Rm9j dXNlZCwgZmFsc2UpOwogICAgICAgICB0aGlzLl9jaGVja0NvbnRlbnRVcGRhdGVkKCk7CisgICAg ICAgIHRoaXMuX3VpU291cmNlQ29kZS5zZXRMYXp5V29ya2luZ0NvcHlQcm92aWRlcihuZXcgV2Vi SW5zcGVjdG9yLlVJU291cmNlQ29kZUZyYW1lLlRleHRFZGl0b3JXb3JraW5nQ29weVByb3ZpZGVy KHRoaXMudGV4dEVkaXRvcikpOwogICAgIH0sCiAKICAgICB3aWxsSGlkZTogZnVuY3Rpb24oKQpA QCAtNTQsNiArNTYsNyBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBl ID0gewogICAgICAgICBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLndpbGxIaWRl LmNhbGwodGhpcyk7CiAgICAgICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVyKCJmb2N1cyIs IHRoaXMuX2JvdW5kV2luZG93Rm9jdXNlZCwgZmFsc2UpOwogICAgICAgICBkZWxldGUgdGhpcy5f Ym91bmRXaW5kb3dGb2N1c2VkOworICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGUucmVtb3ZlTGF6 eVdvcmtpbmdDb3B5UHJvdmlkZXIoKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC04NSw3ICs4OCw5 IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5faXNDb21taXR0aW5nRWRpdGluZyA9IHRydWU7 CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZS5yZW1vdmVMYXp5V29ya2luZ0NvcHlQcm92aWRl cigpOwogICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGUuY29tbWl0V29ya2luZ0NvcHkodGhpcy5f ZGlkRWRpdENvbnRlbnQuYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZS5z ZXRMYXp5V29ya2luZ0NvcHlQcm92aWRlcihuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUZy YW1lLlRleHRFZGl0b3JXb3JraW5nQ29weVByb3ZpZGVyKHRoaXMuX3RleHRFZGl0b3IpKTsKICAg ICAgICAgZGVsZXRlIHRoaXMuX2lzQ29tbWl0dGluZ0VkaXRpbmc7CiAgICAgfSwKIApAQCAtOTMs NyArOTgsOCBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlID0gewog ICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5vblRleHRD aGFuZ2VkLmNhbGwodGhpcywgb2xkUmFuZ2UsIG5ld1JhbmdlKTsKICAgICAgICAgdGhpcy5faXNT ZXR0aW5nV29ya2luZ0NvcHkgPSB0cnVlOwotICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGUuc2V0 V29ya2luZ0NvcHkodGhpcy5fdGV4dEVkaXRvci50ZXh0KCkpOworICAgICAgICB0aGlzLl91aVNv dXJjZUNvZGUubm90aWZ5V29ya2luZ0NvcHlDaGFuZ2VkKHRoaXMuX3dhc0RpcnR5KTsKKyAgICAg ICAgdGhpcy5fd2FzRGlydHkgPSB0aGlzLl91aVNvdXJjZUNvZGUuaXNEaXJ0eSgpOwogICAgICAg ICBkZWxldGUgdGhpcy5faXNTZXR0aW5nV29ya2luZ0NvcHk7CiAgICAgfSwKIApAQCAtMTIwLDcg KzEyNiw3IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUgPSB7CiAg ICAgICovCiAgICAgX29uV29ya2luZ0NvcHlDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKICAgICB7 Ci0gICAgICAgIHRoaXMuX2lubmVyU2V0Q29udGVudCh0aGlzLl91aVNvdXJjZUNvZGUud29ya2lu Z0NvcHkoKSk7CisgICAgICAgIHRoaXMuX2lubmVyU2V0Q29udGVudCgpOwogICAgIH0sCiAKICAg ICAvKioKQEAgLTEyOCw3ICsxMzQsOCBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUu cHJvdG90eXBlID0gewogICAgICAqLwogICAgIF9vbldvcmtpbmdDb3B5Q29tbWl0dGVkOiBmdW5j dGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2lubmVyU2V0Q29udGVudCh0aGlzLl91 aVNvdXJjZUNvZGUud29ya2luZ0NvcHkoKSk7CisgICAgICAgIHRoaXMuX3RleHRFZGl0b3IubWFy a0NsZWFuKCk7CisgICAgICAgIHRoaXMuX2lubmVyU2V0Q29udGVudCgpOwogICAgIH0sCiAKICAg ICAvKioKQEAgLTEzOSwxNCArMTQ2LDExIEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFt ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuc2V0Q29udGVudChjb250ZW50LCBmYWxzZSwg dGhpcy5fdWlTb3VyY2VDb2RlLm1pbWVUeXBlKCkpOwogICAgIH0sCiAKLSAgICAvKioKLSAgICAg KiBAcGFyYW0ge3N0cmluZ30gY29udGVudAotICAgICAqLwotICAgIF9pbm5lclNldENvbnRlbnQ6 IGZ1bmN0aW9uKGNvbnRlbnQpCisgICAgX2lubmVyU2V0Q29udGVudDogZnVuY3Rpb24oKQogICAg IHsKICAgICAgICAgaWYgKHRoaXMuX2lzU2V0dGluZ1dvcmtpbmdDb3B5IHx8IHRoaXMuX2lzQ29t bWl0dGluZ0VkaXRpbmcpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHRoaXMub25VSVNv dXJjZUNvZGVDb250ZW50Q2hhbmdlZChjb250ZW50KTsKKyAgICAgICAgdGhpcy5vblVJU291cmNl Q29kZUNvbnRlbnRDaGFuZ2VkKHRoaXMuX3VpU291cmNlQ29kZS53b3JraW5nQ29weSgpKTsKICAg ICB9LAogCiAgICAgcG9wdWxhdGVUZXh0QXJlYUNvbnRleHRNZW51OiBmdW5jdGlvbihjb250ZXh0 TWVudSwgbGluZU51bWJlcikKQEAgLTE2MywzICsxNjcsMzEgQEAgV2ViSW5zcGVjdG9yLlVJU291 cmNlQ29kZUZyYW1lLnByb3RvdHlwZSA9IHsKIAogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lLnByb3RvdHlwZQogfQorCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGlt cGxlbWVudHMge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuTGF6eVdvcmtpbmdDb3B5UHJvdmlk ZXJ9CisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UZXh0RWRpdG9yfSB0ZXh0RWRpdG9yCisgKi8K K1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5UZXh0RWRpdG9yV29ya2luZ0NvcHlQcm92 aWRlciA9IGZ1bmN0aW9uKHRleHRFZGl0b3IpCit7CisgICAgdGhpcy5fdGV4dEVkaXRvciA9IHRl eHRFZGl0b3I7Cit9CisKK1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5UZXh0RWRpdG9y V29ya2luZ0NvcHlQcm92aWRlci5wcm90b3R5cGUgPSB7CisgICAgLyoqCisgICAgICogQHJldHVy biB7c3RyaW5nfQorICAgICAqLworICAgIHdvcmtpbmdDb3B5OiBmdW5jdGlvbigpCisgICAgewor ICAgICAgICByZXR1cm4gdGhpcy5fdGV4dEVkaXRvci50ZXh0KCk7CisgICAgfSwKKworICAgIC8q KgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisgICAgaXNEaXJ0eTogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuICF0aGlzLl90ZXh0RWRpdG9yLmlzQ2xlYW4oKTsK KyAgICB9Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo=