71922 2011-11-09 09:00:25 -0800 Web Inspector: [refactoring] get rid of JavaScriptSourceFrameDelegate 2011-11-10 02:09:59 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 499024 0 caseq 2011-11-09 09:00:25 -0800 ... use ScriptsPanel directly from JavaScriptSourceFrame. 499029 1 114297 caseq 2011-11-09 09:03:33 -0800 Created attachment 114297 Patch 499043 2 114297 pfeldman 2011-11-09 09:15:15 -0800 Comment on attachment 114297 Patch Please fix the test LayoutTests/inspector/debugger/debugger-breakpoints-not-activated-on-reload.html. 499050 3 114300 caseq 2011-11-09 09:22:49 -0800 Created attachment 114300 Patch 499722 4 114300 pfeldman 2011-11-10 01:30:25 -0800 Comment on attachment 114300 Patch Please convert that getter to a function. 499736 5 caseq 2011-11-10 02:09:59 -0800 Committed r99829: <http://trac.webkit.org/changeset/99829> 114297 2011-11-09 09:03:33 -0800 2011-11-09 09:22:41 -0800 Patch bug-71922-20111109210330.patch text/plain 16060 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogOTk3MTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkODFmZmZlMDRlNGRiZjE0 YjkxOTgyNjMwYThmYzI1MjZmY2UwZmI3Li5hMDNlYjFlODE3MzU2ZWUwMzQxM2RiNmUyNGE2NDM1 NDFjZDZkY2NmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzIgQEAKIDIwMTEtMTEtMDkgIEFuZHJl eSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBbcmVmYWN0b3JpbmddIGdldCByaWQgb2YgSmF2YVNjcmlwdFNvdXJjZUZyYW1lRGVsZWdhdGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxOTIyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFT Y3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuc3VnZ2VzdGVkRmlsZU5hbWUpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuX29uQ29udGVudENo YW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90 b3R5cGUuc2V0UmVhZE9ubHkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3Vy Y2VGcmFtZS5wcm90b3R5cGUucG9wdWxhdGVMaW5lR3V0dGVyQ29udGV4dE1lbnUuYWRkQ29uZGl0 aW9uYWxCcmVha3BvaW50LmRpZEVkaXRCcmVha3BvaW50Q29uZGl0aW9uKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLnBvcHVsYXRlTGluZUd1 dHRlckNvbnRleHRNZW51Lik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJj ZUZyYW1lLnByb3RvdHlwZS5wb3B1bGF0ZVRleHRBcmVhQ29udGV4dE1lbnUpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuYmVmb3JlVGV4dENo YW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90 b3R5cGUuZGlkRWRpdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRT b3VyY2VGcmFtZS5wcm90b3R5cGUuX3NldEJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuX29uTW91c2VEb3duKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLmFjdGl2YXRlQnJlYWtwb2ludHMpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuZm9sZGVyQW5kRGlzcGxh eU5hbWVGb3JTY3JpcHRVUkwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUuc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fY3JlYXRlU291cmNlRnJhbWUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3RvZ2dsZUZvcm1hdFNvdXJj ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5hZGRUb1dh dGNoKToKKworMjAxMS0xMS0wOSAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3Jn PgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtyZWZhY3RvcmluZ10gcmVtb3ZlIGEgYnVuY2gg b2YgbWV0aG9kcyBmcm9tIEphdmFTY3JpcHRTb3VyY2VGcmFtZURlbGVnYXRlCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTgyNgogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFt ZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJj ZUZyYW1lLmpzCmluZGV4IDc2YTZhMDU2ZmY2ZWIxMzM5ZTMwZDA5MDJkYTEyZWM5MjY4OTA2OWMu LjNhMDA3ZmVhNmVhMjJjOWM2YzU2N2UyNTQwMjA5MGFlZWZlYjk2NDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJj ZUZyYW1lLmpzCkBAIC0zMSwyNiArMzEsMjUgQEAKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBA ZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lfQotICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lRGVsZWdhdGV9IGRlbGVnYXRlCisgKiBAcGFyYW0ge1dl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWx9IHNjcmlwdHNQYW5lbAogICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbH0gbW9kZWwKICAqIEBwYXJhbSB7V2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCiAgKi8KLVdlYkluc3BlY3Rvci5KYXZh U2NyaXB0U291cmNlRnJhbWUgPSBmdW5jdGlvbihkZWxlZ2F0ZSwgbW9kZWwsIHVpU291cmNlQ29k ZSkKK1dlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUgPSBmdW5jdGlvbihzY3JpcHRz UGFuZWwsIG1vZGVsLCB1aVNvdXJjZUNvZGUpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lLmNhbGwodGhpcywgdWlTb3VyY2VDb2RlLnVybCk7CiAKLSAgICB0aGlzLl9kZWxlZ2F0ZSA9 IGRlbGVnYXRlOworICAgIHRoaXMuX3NjcmlwdHNQYW5lbCA9IHNjcmlwdHNQYW5lbDsKKyAgICB0 aGlzLl9tb2RlbCA9IG1vZGVsOworICAgIHRoaXMuX3VpU291cmNlQ29kZSA9IHVpU291cmNlQ29k ZTsgCisgICAgdGhpcy5fcG9wb3Zlck9iamVjdEdyb3VwID0gInBvcG92ZXIiOworICAgIHRoaXMu X2JyZWFrcG9pbnRzID0ge307CiAgICAgdGhpcy5fcG9wb3ZlckhlbHBlciA9IG5ldyBXZWJJbnNw ZWN0b3IuT2JqZWN0UG9wb3ZlckhlbHBlcih0aGlzLnRleHRWaWV3ZXIuZWxlbWVudCwKICAgICAg ICAgICAgIHRoaXMuX2dldFBvcG92ZXJBbmNob3IuYmluZCh0aGlzKSwgdGhpcy5fb25TaG93UG9w b3Zlci5iaW5kKHRoaXMpLCB0aGlzLl9vbkhpZGVQb3BvdmVyLmJpbmQodGhpcyksIHRydWUpOwog CiAgICAgdGhpcy50ZXh0Vmlld2VyLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3du IiwgdGhpcy5fb25Nb3VzZURvd24uYmluZCh0aGlzKSwgdHJ1ZSk7Ci0gICAgdWlTb3VyY2VDb2Rl LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVudHMuQ29udGVu dENoYW5nZWQsIHRoaXMuX29uQ29udGVudENoYW5nZWQsIHRoaXMpOworICAgIHRoaXMuX3VpU291 cmNlQ29kZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRz LkNvbnRlbnRDaGFuZ2VkLCB0aGlzLl9vbkNvbnRlbnRDaGFuZ2VkLCB0aGlzKTsKICAgICB0aGlz LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLkV2ZW50cy5Mb2FkZWQs IHRoaXMuX29uVGV4dFZpZXdlckNvbnRlbnRMb2FkZWQsIHRoaXMpOwotCi0gICAgdGhpcy5fbW9k ZWwgPSBtb2RlbDsKLSAgICB0aGlzLl91aVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGU7IAotICAg IHRoaXMuX3BvcG92ZXJPYmplY3RHcm91cCA9ICJwb3BvdmVyIjsKLSAgICB0aGlzLl9icmVha3Bv aW50cyA9IHt9OwogfQogCiBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3Rv dHlwZSA9IHsKQEAgLTc0LDcgKzczLDggQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VG cmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBzdWdnZXN0ZWRGaWxlTmFtZTogZnVuY3Rpb24oKQog ICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2RlbGVnYXRlLnN1Z2dlc3RlZEZpbGVOYW1lKCk7 CisgICAgICAgIHZhciBuYW1lcyA9IHRoaXMuX3NjcmlwdHNQYW5lbC5mb2xkZXJBbmREaXNwbGF5 TmFtZUZvclNjcmlwdFVSTCh0aGlzLl91aVNvdXJjZUNvZGUudXJsKTsKKyAgICAgICAgcmV0dXJu IG5hbWVzLmRpc3BsYXlOYW1lIHx8ICJ1bnRpdGxlZC5qcyI7CiAgICAgfSwKIAogICAgIGVkaXRD b250ZW50OiBmdW5jdGlvbihuZXdDb250ZW50LCBjYWxsYmFjaykKQEAgLTg2LDcgKzg2LDcgQEAg V2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgewog ICAgICAgICBpZiAoIXRoaXMudGV4dFZpZXdlci5yZWFkT25seSkKICAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgdGhpcy5fZGVsZWdhdGUucmVxdWVzdENvbnRlbnQodGhpcy5zZXRDb250ZW50 LmJpbmQodGhpcykpOworICAgICAgICB0aGlzLnJlcXVlc3RDb250ZW50KHRoaXMuc2V0Q29udGVu dC5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAgc2V0UmVhZE9ubHk6IGZ1bmN0aW9uKHJlYWRP bmx5KQpAQCAtOTUsNyArOTUsNyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1l LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3BvcG92ZXJIZWxwZXIuaGlkZVBvcG92 ZXIoKTsKICAgICAgICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5zZXRSZWFk T25seS5jYWxsKHRoaXMsIHJlYWRPbmx5KTsKICAgICAgICAgaWYgKHJlYWRPbmx5KQotICAgICAg ICAgICAgdGhpcy5fZGVsZWdhdGUuc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZChmYWxzZSk7 CisgICAgICAgICAgICB0aGlzLl9zY3JpcHRzUGFuZWwuc2V0U2NyaXB0U291cmNlSXNCZWluZ0Vk aXRlZCh0aGlzLl91aVNvdXJjZUNvZGUsIGZhbHNlKTsKICAgICB9LAogCiAgICAgcG9wdWxhdGVM aW5lR3V0dGVyQ29udGV4dE1lbnU6IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbnRleHRNZW51KQpA QCAtMTA1LDcgKzEwNSw3IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJv dG90eXBlID0gewogICAgICAgICB2YXIgYnJlYWtwb2ludCA9IHRoaXMuX21vZGVsLmZpbmRCcmVh a3BvaW50KHRoaXMuX3VpU291cmNlQ29kZSwgbGluZU51bWJlcik7CiAgICAgICAgIGlmICghYnJl YWtwb2ludCkgewogICAgICAgICAgICAgLy8gVGhpcyByb3cgZG9lc24ndCBoYXZlIGEgYnJlYWtw b2ludDogV2Ugd2FudCB0byBzaG93IEFkZCBCcmVha3BvaW50IGFuZCBBZGQgYW5kIEVkaXQgQnJl YWtwb2ludC4KLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9y LlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiQWRkIGJy ZWFrcG9pbnQiIDogIkFkZCBCcmVha3BvaW50IiksIHRoaXMuX2RlbGVnYXRlLnNldEJyZWFrcG9p bnQuYmluZCh0aGlzLl9kZWxlZ2F0ZSwgbGluZU51bWJlciwgIiIsIHRydWUpKTsKKyAgICAgICAg ICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3Bl Y3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiQWRkIGJyZWFrcG9pbnQiIDogIkFkZCBC cmVha3BvaW50IiksIHRoaXMuX3NldEJyZWFrcG9pbnQuYmluZCh0aGlzLCBsaW5lTnVtYmVyLCAi IiwgdHJ1ZSkpOwogCiAgICAgICAgICAgICBmdW5jdGlvbiBhZGRDb25kaXRpb25hbEJyZWFrcG9p bnQoKQogICAgICAgICAgICAgewpAQCAtMTE0LDcgKzExNCw3IEBAIFdlYkluc3BlY3Rvci5KYXZh U2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHsKICAgICAg ICAgICAgICAgICAgICAgdGhpcy5yZW1vdmVCcmVha3BvaW50KGxpbmVOdW1iZXIpOwogICAgICAg ICAgICAgICAgICAgICBpZiAoY29tbWl0dGVkKQotICAgICAgICAgICAgICAgICAgICAgICAgdGhp cy5fZGVsZWdhdGUuc2V0QnJlYWtwb2ludChsaW5lTnVtYmVyLCBjb25kaXRpb24sIHRydWUpOwor ICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fc2V0QnJlYWtwb2ludChsaW5lTnVtYmVyLCBj b25kaXRpb24sIHRydWUpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB0aGlz Ll9lZGl0QnJlYWtwb2ludENvbmRpdGlvbihsaW5lTnVtYmVyLCAiIiwgZGlkRWRpdEJyZWFrcG9p bnRDb25kaXRpb24uYmluZCh0aGlzKSk7CiAgICAgICAgICAgICB9CkBAIC0xNDksNyArMTQ5LDkg QEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHZhciBzZWxlY3Rpb24gPSB3aW5kb3cuZ2V0U2VsZWN0aW9uKCk7CiAgICAgICAgIGlmIChz ZWxlY3Rpb24udHlwZSAhPT0gIlJhbmdlIiB8fCBzZWxlY3Rpb24uaXNDb2xsYXBzZWQpCiAgICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVj dG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiQWRk IHRvIHdhdGNoIiA6ICJBZGQgdG8gV2F0Y2giKSwgdGhpcy5fZGVsZWdhdGUuYWRkVG9XYXRjaC5i aW5kKHRoaXMuX2RlbGVnYXRlLCBzZWxlY3Rpb24udG9TdHJpbmcoKSkpOworICAgICAgICBjb250 ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNl TG93ZXJDYXNlTWVudVRpdGxlcygpID8gIkFkZCB0byB3YXRjaCIgOiAiQWRkIHRvIFdhdGNoIiks IAorICAgICAgICAgICAgICAgIHRoaXMuX3NjcmlwdHNQYW5lbC5hZGRUb1dhdGNoLmJpbmQodGhp cy5fc2NyaXB0c1BhbmVsLCBzZWxlY3Rpb24udG9TdHJpbmcoKSkpOworCiAgICAgICAgIGNvbnRl eHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VM b3dlckNhc2VNZW51VGl0bGVzKCkgPyAiRXZhbHVhdGUgaW4gY29uc29sZSIgOiAiRXZhbHVhdGUg aW4gQ29uc29sZSIpLCBXZWJJbnNwZWN0b3IuZXZhbHVhdGVJbkNvbnNvbGUuYmluZChXZWJJbnNw ZWN0b3IsIHNlbGVjdGlvbi50b1N0cmluZygpKSk7CiAgICAgfSwKIApAQCAtMTg4LDcgKzE5MCw3 IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAg ICAgICAgICAgICAgIGV4ZWN1dGlvbkxpbmVOdW1iZXI6IHRoaXMuX2V4ZWN1dGlvbkxpbmVOdW1i ZXIsCiAgICAgICAgICAgICAgICAgYnJlYWtwb2ludHM6IHRoaXMuX2JyZWFrcG9pbnRzCiAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5zZXRTY3JpcHRTb3VyY2VJc0Jl aW5nRWRpdGVkKHRydWUpOworICAgICAgICAgICAgdGhpcy5fc2NyaXB0c1BhbmVsLnNldFNjcmlw dFNvdXJjZUlzQmVpbmdFZGl0ZWQodGhpcy5fdWlTb3VyY2VDb2RlLCB0cnVlKTsKICAgICAgICAg fQogICAgICAgICBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLmJlZm9yZVRleHRD aGFuZ2VkLmNhbGwodGhpcyk7CiAgICAgfSwKQEAgLTIzNywxMCArMjM5LDkgQEAgV2ViSW5zcGVj dG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgZm9yICh2 YXIgbGluZU51bWJlciBpbiBuZXdCcmVha3BvaW50cykgewogICAgICAgICAgICAgdmFyIGJyZWFr cG9pbnQgPSBuZXdCcmVha3BvaW50c1tsaW5lTnVtYmVyXTsKLSAgICAgICAgICAgIHRoaXMuX2Rl bGVnYXRlLnNldEJyZWFrcG9pbnQoTnVtYmVyKGxpbmVOdW1iZXIpLCBicmVha3BvaW50LmNvbmRp dGlvbiwgYnJlYWtwb2ludC5lbmFibGVkKTsKKyAgICAgICAgICAgIHRoaXMuX3NldEJyZWFrcG9p bnQoTnVtYmVyKGxpbmVOdW1iZXIpLCBicmVha3BvaW50LmNvbmRpdGlvbiwgYnJlYWtwb2ludC5l bmFibGVkKTsKICAgICAgICAgfQotCi0gICAgICAgIHRoaXMuX2RlbGVnYXRlLnNldFNjcmlwdFNv dXJjZUlzQmVpbmdFZGl0ZWQoZmFsc2UpOworICAgICAgICB0aGlzLl9zY3JpcHRzUGFuZWwuc2V0 U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZCh0aGlzLl91aVNvdXJjZUNvZGUsIGZhbHNlKTsKICAg ICAgICAgZGVsZXRlIHRoaXMuX2phdmFTY3JpcHRTb3VyY2VGcmFtZVN0YXRlOwogICAgIH0sCiAK QEAgLTM1Nyw2ICszNTgsMTIgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMudGV4dFZpZXdlci5lbmRVcGRhdGVzKCk7CiAgICAg fSwKIAorICAgIF9zZXRCcmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb25kaXRpb24s IGVuYWJsZWQpCisgICAgeworICAgICAgICB0aGlzLl9tb2RlbC5zZXRCcmVha3BvaW50KHRoaXMu X3VpU291cmNlQ29kZSwgbGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKTsKKyAgICAgICAg dGhpcy5fc2NyaXB0c1BhbmVsLmFjdGl2YXRlQnJlYWtwb2ludHMoKTsKKyAgICB9LAorCiAgICAg X29uTW91c2VEb3duOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIGlmIChldmVudC5i dXR0b24gIT0gMCB8fCBldmVudC5hbHRLZXkgfHwgZXZlbnQuY3RybEtleSB8fCBldmVudC5tZXRh S2V5KQpAQCAtMzczLDcgKzM4MCw3IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJh bWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHRoaXMu X21vZGVsLnJlbW92ZUJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyKTsK ICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5zZXRCcmVha3BvaW50 KGxpbmVOdW1iZXIsICIiLCB0cnVlKTsKKyAgICAgICAgICAgIHRoaXMuX3NldEJyZWFrcG9pbnQo bGluZU51bWJlciwgIiIsIHRydWUpOwogICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwog ICAgIH0sCiAKQEAgLTQ2NiwyNSArNDczLDMgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3Vy Y2VGcmFtZS5wcm90b3R5cGUgPSB7CiB9CiAKIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNl RnJhbWUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90 b3R5cGU7Ci0KLS8qKgotICogQGludGVyZmFjZQotICovCi1XZWJJbnNwZWN0b3IuSmF2YVNjcmlw dFNvdXJjZUZyYW1lRGVsZWdhdGUgPSBmdW5jdGlvbigpCi17Ci19Ci0KLVdlYkluc3BlY3Rvci5K YXZhU2NyaXB0U291cmNlRnJhbWVEZWxlZ2F0ZS5wcm90b3R5cGUgPSB7Ci0gICAgc2V0QnJlYWtw b2ludDogZnVuY3Rpb24obGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKSB7IH0sCi0KLSAg ICBzZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkOiBmdW5jdGlvbihpbkVkaXRNb2RlKSB7IH0s Ci0KLSAgICBzdWdnZXN0ZWRGaWxlTmFtZTogZnVuY3Rpb24oKSB7IH0sCi0KLSAgICBhZGRUb1dh dGNoOiBmdW5jdGlvbigpIHsgfQotfQotCi0vKioKLSAqIERlZmF1bHQgaW1wbGVtZW50YXRpb24u Ci0gKi8KLVdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWVEZWxlZ2F0ZS5zdHViID0g T2JqZWN0LmNyZWF0ZShXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lRGVsZWdhdGUu cHJvdG90eXBlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanMKaW5kZXggNmJlZDUxOWFkOTc2MTdiMDRlY2IxZWZhMTZmNTJkMjY3ZGM0 YjAxOC4uYjRhMTEyNzJkOGNkMjY1ZmZmZTQ4NDkzOTY2YWZhMjBhZGM2NzQ5ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAg LTIyOSw5ICsyMjksMTAgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLndhdGNoRXhwcmVzc2lvbnMuc2hvdygpOwogICAg IH0sCiAKLSAgICBnZXQgYnJlYWtwb2ludHNBY3RpdmF0ZWQoKQorICAgIGFjdGl2YXRlQnJlYWtw b2ludHM6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLnRvZ2dsZUJyZWFr cG9pbnRzQnV0dG9uLnRvZ2dsZWQ7CisgICAgICAgIGlmICghdGhpcy50b2dnbGVCcmVha3BvaW50 c0J1dHRvbi50b2dnbGVkKQorICAgICAgICAgICAgdGhpcy5fdG9nZ2xlQnJlYWtwb2ludHNDbGlj a2VkKCk7CiAgICAgfSwKIAogICAgIF91aVNvdXJjZUNvZGVBZGRlZDogZnVuY3Rpb24oZXZlbnQp CkBAIC0zMDAsNyArMzAxLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUg PSB7CiAKICAgICAgICAgY29uc3QgaW5kZW50ID0gV2ViSW5zcGVjdG9yLmlzTWFjKCkgPyAiIiA6 ICJcdTAwYTBcdTAwYTBcdTAwYTBcdTAwYTAiOwogCi0gICAgICAgIHZhciBuYW1lcyA9IHRoaXMu X2ZvbGRlckFuZERpc3BsYXlOYW1lRm9yU2NyaXB0VVJMKHVpU291cmNlQ29kZS51cmwpOworICAg ICAgICB2YXIgbmFtZXMgPSB0aGlzLmZvbGRlckFuZERpc3BsYXlOYW1lRm9yU2NyaXB0VVJMKHVp U291cmNlQ29kZS51cmwpOwogICAgICAgICBvcHRpb24uZGlzcGxheU5hbWUgPSBuYW1lcy5kaXNw bGF5TmFtZTsKIAogICAgICAgICB2YXIgY29udGVudFNjcmlwdFByZWZpeCA9IHVpU291cmNlQ29k ZS5pc0NvbnRlbnRTY3JpcHQgPyAiMjoiIDogIjA6IjsKQEAgLTM3MSw3ICszNzIsNyBAQCBXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdWlTb3VyY2VDb2Rl Ll9vcHRpb24gPSBvcHRpb247CiAgICAgfSwKIAotICAgIF9mb2xkZXJBbmREaXNwbGF5TmFtZUZv clNjcmlwdFVSTDogZnVuY3Rpb24odXJsKQorICAgIGZvbGRlckFuZERpc3BsYXlOYW1lRm9yU2Ny aXB0VVJMOiBmdW5jdGlvbih1cmwpCiAgICAgewogICAgICAgICB2YXIgcGFyc2VkVVJMID0gdXJs LmFzUGFyc2VkVVJMKCk7CiAgICAgICAgIGlmIChwYXJzZWRVUkwpCkBAIC0zOTksNyArNDAwLDcg QEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVy biB7IGRvbWFpbjogKHBhcnNlZFVSTCA/IHBhcnNlZFVSTC5ob3N0IDogIiIpLCBmb2xkZXJOYW1l OiBmb2xkZXJOYW1lLCBkaXNwbGF5TmFtZTogZGlzcGxheU5hbWUgfTsKICAgICB9LAogCi0gICAg X3NldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQ6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwgaW5F ZGl0TW9kZSkKKyAgICBzZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkOiBmdW5jdGlvbih1aVNv dXJjZUNvZGUsIGluRWRpdE1vZGUpCiAgICAgewogICAgICAgICB2YXIgb3B0aW9uID0gdWlTb3Vy Y2VDb2RlLl9vcHRpb247CiAgICAgICAgIGlmICghb3B0aW9uKQpAQCAtNjQ2LDggKzY0Nyw3IEBA IFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgX2NyZWF0ZVNv dXJjZUZyYW1lOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAgewotICAgICAgICB2YXIgZGVs ZWdhdGUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFu ZWwodGhpcywgdWlTb3VyY2VDb2RlKTsKLSAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gbmV3IFdl Ykluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUoZGVsZWdhdGUsIHRoaXMuX3ByZXNlbnRh dGlvbk1vZGVsLCB1aVNvdXJjZUNvZGUpOworICAgICAgICB2YXIgc291cmNlRnJhbWUgPSBuZXcg V2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZSh0aGlzLCB0aGlzLl9wcmVzZW50YXRp b25Nb2RlbCwgdWlTb3VyY2VDb2RlKTsKIAogICAgICAgICBzb3VyY2VGcmFtZS5fdWlTb3VyY2VD b2RlID0gdWlTb3VyY2VDb2RlOwogICAgICAgICBzb3VyY2VGcmFtZS5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5FdmVudHMuTG9hZGVkLCB0aGlzLl9zb3VyY2VGcmFt ZUxvYWRlZCwgdGhpcyk7CkBAIC0xMTU0LDUwICsxMTU0LDEyIEBAIFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy5fdG9nZ2xlRm9ybWF0 U291cmNlQnV0dG9uLnRvZ2dsZWQgPSAhdGhpcy5fdG9nZ2xlRm9ybWF0U291cmNlQnV0dG9uLnRv Z2dsZWQ7CiAgICAgICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNldEZvcm1hdFNvdXJjZSh0 aGlzLl90b2dnbGVGb3JtYXRTb3VyY2VCdXR0b24udG9nZ2xlZCk7Ci0gICAgfQotfQotCi1XZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3Iu UGFuZWwucHJvdG90eXBlOwotCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgotICogQGltcGxlbWVudHMg e1dlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWVEZWxlZ2F0ZX0KLSAqIEBwYXJhbSB7 V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbH0gc2NyaXB0c1BhbmVsCi0gKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQotICovCi1XZWJJbnNwZWN0b3IuU291 cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHNjcmlwdHNQYW5lbCwg dWlTb3VyY2VDb2RlKQotewotICAgIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWVE ZWxlZ2F0ZS5jYWxsKHRoaXMpOwotCi0gICAgdGhpcy5fc2NyaXB0c1BhbmVsID0gc2NyaXB0c1Bh bmVsOwotICAgIHRoaXMuX21vZGVsID0gdGhpcy5fc2NyaXB0c1BhbmVsLl9wcmVzZW50YXRpb25N b2RlbDsKLSAgICB0aGlzLl91aVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGU7Ci19Ci0KLVdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsK LSAgICBzZXRCcmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJs ZWQpCi0gICAgewotICAgICAgICB0aGlzLl9tb2RlbC5zZXRCcmVha3BvaW50KHRoaXMuX3VpU291 cmNlQ29kZSwgbGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKTsKLQotICAgICAgICBpZiAo IXRoaXMuX3NjcmlwdHNQYW5lbC5icmVha3BvaW50c0FjdGl2YXRlZCkKLSAgICAgICAgICAgIHRo aXMuX3NjcmlwdHNQYW5lbC5fdG9nZ2xlQnJlYWtwb2ludHNDbGlja2VkKCk7Ci0gICAgfSwKLQot ICAgIHNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQ6IGZ1bmN0aW9uKGluRWRpdE1vZGUpCi0g ICAgewotICAgICAgICB0aGlzLl9zY3JpcHRzUGFuZWwuX3NldFNjcmlwdFNvdXJjZUlzQmVpbmdF ZGl0ZWQodGhpcy5fdWlTb3VyY2VDb2RlLCBpbkVkaXRNb2RlKTsKLSAgICB9LAotCi0gICAgc3Vn Z2VzdGVkRmlsZU5hbWU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHZhciBuYW1lcyA9IHRo aXMuX3NjcmlwdHNQYW5lbC5fZm9sZGVyQW5kRGlzcGxheU5hbWVGb3JTY3JpcHRVUkwodGhpcy5f dWlTb3VyY2VDb2RlLnVybCk7Ci0gICAgICAgIHJldHVybiBuYW1lcy5kaXNwbGF5TmFtZSB8fCAi dW50aXRsZWQuanMiOwogICAgIH0sCiAKICAgICBhZGRUb1dhdGNoOiBmdW5jdGlvbihleHByZXNz aW9uKQogICAgIHsKLSAgICAgICAgdGhpcy5fc2NyaXB0c1BhbmVsLnNpZGViYXJQYW5lcy53YXRj aEV4cHJlc3Npb25zLmFkZEV4cHJlc3Npb24oZXhwcmVzc2lvbik7CisgICAgICAgIHRoaXMuc2lk ZWJhclBhbmVzLndhdGNoRXhwcmVzc2lvbnMuYWRkRXhwcmVzc2lvbihleHByZXNzaW9uKTsKICAg ICB9CiB9CiAKLVdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVs LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1l RGVsZWdhdGUucHJvdG90eXBlOworV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUu X19wcm90b19fID0gV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzZDY1YzI3 NzAxODkwNzM4YmZlMGUxMDkzNGU5NzczMjZkYWJhMWJlLi40NTdiNzg3NTgxNGM4ZTBkOTAyYjE1 MzczY2VmNGJmMzFlNzZlMTg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAKIDIwMTEtMTEtMDkgIEFu ZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVj dG9yOiBbcmVmYWN0b3JpbmddIGdldCByaWQgb2YgSmF2YVNjcmlwdFNvdXJjZUZyYW1lRGVsZWdh dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxOTIy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodHRw L3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzOgorICAgICAgICAoaW5pdGlhbGl6ZV9E ZWJ1Z2dlclRlc3QpOgorCisyMDExLTExLTA5ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJv bWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogW3JlZmFjdG9yaW5nXSByZW1vdmUg YSBidW5jaCBvZiBtZXRob2RzIGZyb20gSmF2YVNjcmlwdFNvdXJjZUZyYW1lRGVsZWdhdGUKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxODI2CiAKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3Qu anMgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzCmlu ZGV4IGJjMWQ1YmRkNzRkYjZmZmZlZTczNDRkNTFjNGI1NzNmMmQ2ZTg5MjYuLjIyNjhlZDQyOWUy ZDc4ZGVlZjBkMThhYzFkNjhjNWUyZThjY2QzY2UgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMKKysrIGIvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5qcwpAQCAtMjYsOSArMjYsNyBAQCBJbnNw ZWN0b3JUZXN0LmNvbXBsZXRlRGVidWdnZXJUZXN0ID0gZnVuY3Rpb24oKQogewogICAgIHZhciBz Y3JpcHRzUGFuZWwgPSBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHM7CiAKLSAgICBpZiAoIXNj cmlwdHNQYW5lbC5icmVha3BvaW50c0FjdGl2YXRlZCkKLSAgICAgICAgc2NyaXB0c1BhbmVsLnRv Z2dsZUJyZWFrcG9pbnRzQnV0dG9uLmVsZW1lbnQuY2xpY2soKTsKLQorICAgIHNjcmlwdHNQYW5l bC5hY3RpdmF0ZUJyZWFrcG9pbnRzKCk7CiAgICAgSW5zcGVjdG9yVGVzdC5yZXN1bWVFeGVjdXRp b24oZGlzYWJsZURlYnVnZ2VyKTsKIAogICAgIGZ1bmN0aW9uIGRpc2FibGVEZWJ1Z2dlcigpCkBA IC0xNzUsNyArMTczLDcgQEAgSW5zcGVjdG9yVGVzdC5zaG93U2NyaXB0U291cmNlID0gZnVuY3Rp b24oc2NyaXB0TmFtZSwgY2FsbGJhY2spCiAKIEluc3BlY3RvclRlc3Quc2V0QnJlYWtwb2ludCA9 IGZ1bmN0aW9uKHNvdXJjZUZyYW1lLCBsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpCiB7 Ci0gICAgc291cmNlRnJhbWUuX2RlbGVnYXRlLnNldEJyZWFrcG9pbnQobGluZU51bWJlciwgY29u ZGl0aW9uLCBlbmFibGVkKTsKKyAgICBzb3VyY2VGcmFtZS5fc2V0QnJlYWtwb2ludChsaW5lTnVt YmVyLCBjb25kaXRpb24sIGVuYWJsZWQpOwogfTsKIAogSW5zcGVjdG9yVGVzdC5yZW1vdmVCcmVh a3BvaW50ID0gZnVuY3Rpb24oc291cmNlRnJhbWUsIGxpbmVOdW1iZXIpCg== 114300 2011-11-09 09:22:49 -0800 2011-11-10 01:30:24 -0800 Patch bug-71922-20111109212247.patch text/plain 16012 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogOTk3MTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkODFmZmZlMDRlNGRiZjE0 YjkxOTgyNjMwYThmYzI1MjZmY2UwZmI3Li5hMDNlYjFlODE3MzU2ZWUwMzQxM2RiNmUyNGE2NDM1 NDFjZDZkY2NmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzIgQEAKIDIwMTEtMTEtMDkgIEFuZHJl eSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBbcmVmYWN0b3JpbmddIGdldCByaWQgb2YgSmF2YVNjcmlwdFNvdXJjZUZyYW1lRGVsZWdhdGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxOTIyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFT Y3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuc3VnZ2VzdGVkRmlsZU5hbWUpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuX29uQ29udGVudENo YW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90 b3R5cGUuc2V0UmVhZE9ubHkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3Vy Y2VGcmFtZS5wcm90b3R5cGUucG9wdWxhdGVMaW5lR3V0dGVyQ29udGV4dE1lbnUuYWRkQ29uZGl0 aW9uYWxCcmVha3BvaW50LmRpZEVkaXRCcmVha3BvaW50Q29uZGl0aW9uKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLnBvcHVsYXRlTGluZUd1 dHRlckNvbnRleHRNZW51Lik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJj ZUZyYW1lLnByb3RvdHlwZS5wb3B1bGF0ZVRleHRBcmVhQ29udGV4dE1lbnUpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuYmVmb3JlVGV4dENo YW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90 b3R5cGUuZGlkRWRpdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRT b3VyY2VGcmFtZS5wcm90b3R5cGUuX3NldEJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuX29uTW91c2VEb3duKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLmFjdGl2YXRlQnJlYWtwb2ludHMpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuZm9sZGVyQW5kRGlzcGxh eU5hbWVGb3JTY3JpcHRVUkwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUuc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fY3JlYXRlU291cmNlRnJhbWUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3RvZ2dsZUZvcm1hdFNvdXJj ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5hZGRUb1dh dGNoKToKKworMjAxMS0xMS0wOSAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3Jn PgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtyZWZhY3RvcmluZ10gcmVtb3ZlIGEgYnVuY2gg b2YgbWV0aG9kcyBmcm9tIEphdmFTY3JpcHRTb3VyY2VGcmFtZURlbGVnYXRlCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTgyNgogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFt ZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJj ZUZyYW1lLmpzCmluZGV4IDc2YTZhMDU2ZmY2ZWIxMzM5ZTMwZDA5MDJkYTEyZWM5MjY4OTA2OWMu LjNhMDA3ZmVhNmVhMjJjOWM2YzU2N2UyNTQwMjA5MGFlZWZlYjk2NDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJj ZUZyYW1lLmpzCkBAIC0zMSwyNiArMzEsMjUgQEAKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBA ZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lfQotICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lRGVsZWdhdGV9IGRlbGVnYXRlCisgKiBAcGFyYW0ge1dl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWx9IHNjcmlwdHNQYW5lbAogICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbH0gbW9kZWwKICAqIEBwYXJhbSB7V2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCiAgKi8KLVdlYkluc3BlY3Rvci5KYXZh U2NyaXB0U291cmNlRnJhbWUgPSBmdW5jdGlvbihkZWxlZ2F0ZSwgbW9kZWwsIHVpU291cmNlQ29k ZSkKK1dlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUgPSBmdW5jdGlvbihzY3JpcHRz UGFuZWwsIG1vZGVsLCB1aVNvdXJjZUNvZGUpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lLmNhbGwodGhpcywgdWlTb3VyY2VDb2RlLnVybCk7CiAKLSAgICB0aGlzLl9kZWxlZ2F0ZSA9 IGRlbGVnYXRlOworICAgIHRoaXMuX3NjcmlwdHNQYW5lbCA9IHNjcmlwdHNQYW5lbDsKKyAgICB0 aGlzLl9tb2RlbCA9IG1vZGVsOworICAgIHRoaXMuX3VpU291cmNlQ29kZSA9IHVpU291cmNlQ29k ZTsgCisgICAgdGhpcy5fcG9wb3Zlck9iamVjdEdyb3VwID0gInBvcG92ZXIiOworICAgIHRoaXMu X2JyZWFrcG9pbnRzID0ge307CiAgICAgdGhpcy5fcG9wb3ZlckhlbHBlciA9IG5ldyBXZWJJbnNw ZWN0b3IuT2JqZWN0UG9wb3ZlckhlbHBlcih0aGlzLnRleHRWaWV3ZXIuZWxlbWVudCwKICAgICAg ICAgICAgIHRoaXMuX2dldFBvcG92ZXJBbmNob3IuYmluZCh0aGlzKSwgdGhpcy5fb25TaG93UG9w b3Zlci5iaW5kKHRoaXMpLCB0aGlzLl9vbkhpZGVQb3BvdmVyLmJpbmQodGhpcyksIHRydWUpOwog CiAgICAgdGhpcy50ZXh0Vmlld2VyLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3du IiwgdGhpcy5fb25Nb3VzZURvd24uYmluZCh0aGlzKSwgdHJ1ZSk7Ci0gICAgdWlTb3VyY2VDb2Rl LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVudHMuQ29udGVu dENoYW5nZWQsIHRoaXMuX29uQ29udGVudENoYW5nZWQsIHRoaXMpOworICAgIHRoaXMuX3VpU291 cmNlQ29kZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRz LkNvbnRlbnRDaGFuZ2VkLCB0aGlzLl9vbkNvbnRlbnRDaGFuZ2VkLCB0aGlzKTsKICAgICB0aGlz LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLkV2ZW50cy5Mb2FkZWQs IHRoaXMuX29uVGV4dFZpZXdlckNvbnRlbnRMb2FkZWQsIHRoaXMpOwotCi0gICAgdGhpcy5fbW9k ZWwgPSBtb2RlbDsKLSAgICB0aGlzLl91aVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGU7IAotICAg IHRoaXMuX3BvcG92ZXJPYmplY3RHcm91cCA9ICJwb3BvdmVyIjsKLSAgICB0aGlzLl9icmVha3Bv aW50cyA9IHt9OwogfQogCiBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3Rv dHlwZSA9IHsKQEAgLTc0LDcgKzczLDggQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VG cmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBzdWdnZXN0ZWRGaWxlTmFtZTogZnVuY3Rpb24oKQog ICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2RlbGVnYXRlLnN1Z2dlc3RlZEZpbGVOYW1lKCk7 CisgICAgICAgIHZhciBuYW1lcyA9IHRoaXMuX3NjcmlwdHNQYW5lbC5mb2xkZXJBbmREaXNwbGF5 TmFtZUZvclNjcmlwdFVSTCh0aGlzLl91aVNvdXJjZUNvZGUudXJsKTsKKyAgICAgICAgcmV0dXJu IG5hbWVzLmRpc3BsYXlOYW1lIHx8ICJ1bnRpdGxlZC5qcyI7CiAgICAgfSwKIAogICAgIGVkaXRD b250ZW50OiBmdW5jdGlvbihuZXdDb250ZW50LCBjYWxsYmFjaykKQEAgLTg2LDcgKzg2LDcgQEAg V2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgewog ICAgICAgICBpZiAoIXRoaXMudGV4dFZpZXdlci5yZWFkT25seSkKICAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgdGhpcy5fZGVsZWdhdGUucmVxdWVzdENvbnRlbnQodGhpcy5zZXRDb250ZW50 LmJpbmQodGhpcykpOworICAgICAgICB0aGlzLnJlcXVlc3RDb250ZW50KHRoaXMuc2V0Q29udGVu dC5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAgc2V0UmVhZE9ubHk6IGZ1bmN0aW9uKHJlYWRP bmx5KQpAQCAtOTUsNyArOTUsNyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1l LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3BvcG92ZXJIZWxwZXIuaGlkZVBvcG92 ZXIoKTsKICAgICAgICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5zZXRSZWFk T25seS5jYWxsKHRoaXMsIHJlYWRPbmx5KTsKICAgICAgICAgaWYgKHJlYWRPbmx5KQotICAgICAg ICAgICAgdGhpcy5fZGVsZWdhdGUuc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZChmYWxzZSk7 CisgICAgICAgICAgICB0aGlzLl9zY3JpcHRzUGFuZWwuc2V0U2NyaXB0U291cmNlSXNCZWluZ0Vk aXRlZCh0aGlzLl91aVNvdXJjZUNvZGUsIGZhbHNlKTsKICAgICB9LAogCiAgICAgcG9wdWxhdGVM aW5lR3V0dGVyQ29udGV4dE1lbnU6IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbnRleHRNZW51KQpA QCAtMTA1LDcgKzEwNSw3IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJv dG90eXBlID0gewogICAgICAgICB2YXIgYnJlYWtwb2ludCA9IHRoaXMuX21vZGVsLmZpbmRCcmVh a3BvaW50KHRoaXMuX3VpU291cmNlQ29kZSwgbGluZU51bWJlcik7CiAgICAgICAgIGlmICghYnJl YWtwb2ludCkgewogICAgICAgICAgICAgLy8gVGhpcyByb3cgZG9lc24ndCBoYXZlIGEgYnJlYWtw b2ludDogV2Ugd2FudCB0byBzaG93IEFkZCBCcmVha3BvaW50IGFuZCBBZGQgYW5kIEVkaXQgQnJl YWtwb2ludC4KLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9y LlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiQWRkIGJy ZWFrcG9pbnQiIDogIkFkZCBCcmVha3BvaW50IiksIHRoaXMuX2RlbGVnYXRlLnNldEJyZWFrcG9p bnQuYmluZCh0aGlzLl9kZWxlZ2F0ZSwgbGluZU51bWJlciwgIiIsIHRydWUpKTsKKyAgICAgICAg ICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3Bl Y3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiQWRkIGJyZWFrcG9pbnQiIDogIkFkZCBC cmVha3BvaW50IiksIHRoaXMuX3NldEJyZWFrcG9pbnQuYmluZCh0aGlzLCBsaW5lTnVtYmVyLCAi IiwgdHJ1ZSkpOwogCiAgICAgICAgICAgICBmdW5jdGlvbiBhZGRDb25kaXRpb25hbEJyZWFrcG9p bnQoKQogICAgICAgICAgICAgewpAQCAtMTE0LDcgKzExNCw3IEBAIFdlYkluc3BlY3Rvci5KYXZh U2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHsKICAgICAg ICAgICAgICAgICAgICAgdGhpcy5yZW1vdmVCcmVha3BvaW50KGxpbmVOdW1iZXIpOwogICAgICAg ICAgICAgICAgICAgICBpZiAoY29tbWl0dGVkKQotICAgICAgICAgICAgICAgICAgICAgICAgdGhp cy5fZGVsZWdhdGUuc2V0QnJlYWtwb2ludChsaW5lTnVtYmVyLCBjb25kaXRpb24sIHRydWUpOwor ICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fc2V0QnJlYWtwb2ludChsaW5lTnVtYmVyLCBj b25kaXRpb24sIHRydWUpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB0aGlz Ll9lZGl0QnJlYWtwb2ludENvbmRpdGlvbihsaW5lTnVtYmVyLCAiIiwgZGlkRWRpdEJyZWFrcG9p bnRDb25kaXRpb24uYmluZCh0aGlzKSk7CiAgICAgICAgICAgICB9CkBAIC0xNDksNyArMTQ5LDkg QEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHZhciBzZWxlY3Rpb24gPSB3aW5kb3cuZ2V0U2VsZWN0aW9uKCk7CiAgICAgICAgIGlmIChz ZWxlY3Rpb24udHlwZSAhPT0gIlJhbmdlIiB8fCBzZWxlY3Rpb24uaXNDb2xsYXBzZWQpCiAgICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVj dG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiQWRk IHRvIHdhdGNoIiA6ICJBZGQgdG8gV2F0Y2giKSwgdGhpcy5fZGVsZWdhdGUuYWRkVG9XYXRjaC5i aW5kKHRoaXMuX2RlbGVnYXRlLCBzZWxlY3Rpb24udG9TdHJpbmcoKSkpOworICAgICAgICBjb250 ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNl TG93ZXJDYXNlTWVudVRpdGxlcygpID8gIkFkZCB0byB3YXRjaCIgOiAiQWRkIHRvIFdhdGNoIiks IAorICAgICAgICAgICAgICAgIHRoaXMuX3NjcmlwdHNQYW5lbC5hZGRUb1dhdGNoLmJpbmQodGhp cy5fc2NyaXB0c1BhbmVsLCBzZWxlY3Rpb24udG9TdHJpbmcoKSkpOworCiAgICAgICAgIGNvbnRl eHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VM b3dlckNhc2VNZW51VGl0bGVzKCkgPyAiRXZhbHVhdGUgaW4gY29uc29sZSIgOiAiRXZhbHVhdGUg aW4gQ29uc29sZSIpLCBXZWJJbnNwZWN0b3IuZXZhbHVhdGVJbkNvbnNvbGUuYmluZChXZWJJbnNw ZWN0b3IsIHNlbGVjdGlvbi50b1N0cmluZygpKSk7CiAgICAgfSwKIApAQCAtMTg4LDcgKzE5MCw3 IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAg ICAgICAgICAgICAgIGV4ZWN1dGlvbkxpbmVOdW1iZXI6IHRoaXMuX2V4ZWN1dGlvbkxpbmVOdW1i ZXIsCiAgICAgICAgICAgICAgICAgYnJlYWtwb2ludHM6IHRoaXMuX2JyZWFrcG9pbnRzCiAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5zZXRTY3JpcHRTb3VyY2VJc0Jl aW5nRWRpdGVkKHRydWUpOworICAgICAgICAgICAgdGhpcy5fc2NyaXB0c1BhbmVsLnNldFNjcmlw dFNvdXJjZUlzQmVpbmdFZGl0ZWQodGhpcy5fdWlTb3VyY2VDb2RlLCB0cnVlKTsKICAgICAgICAg fQogICAgICAgICBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLmJlZm9yZVRleHRD aGFuZ2VkLmNhbGwodGhpcyk7CiAgICAgfSwKQEAgLTIzNywxMCArMjM5LDkgQEAgV2ViSW5zcGVj dG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgZm9yICh2 YXIgbGluZU51bWJlciBpbiBuZXdCcmVha3BvaW50cykgewogICAgICAgICAgICAgdmFyIGJyZWFr cG9pbnQgPSBuZXdCcmVha3BvaW50c1tsaW5lTnVtYmVyXTsKLSAgICAgICAgICAgIHRoaXMuX2Rl bGVnYXRlLnNldEJyZWFrcG9pbnQoTnVtYmVyKGxpbmVOdW1iZXIpLCBicmVha3BvaW50LmNvbmRp dGlvbiwgYnJlYWtwb2ludC5lbmFibGVkKTsKKyAgICAgICAgICAgIHRoaXMuX3NldEJyZWFrcG9p bnQoTnVtYmVyKGxpbmVOdW1iZXIpLCBicmVha3BvaW50LmNvbmRpdGlvbiwgYnJlYWtwb2ludC5l bmFibGVkKTsKICAgICAgICAgfQotCi0gICAgICAgIHRoaXMuX2RlbGVnYXRlLnNldFNjcmlwdFNv dXJjZUlzQmVpbmdFZGl0ZWQoZmFsc2UpOworICAgICAgICB0aGlzLl9zY3JpcHRzUGFuZWwuc2V0 U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZCh0aGlzLl91aVNvdXJjZUNvZGUsIGZhbHNlKTsKICAg ICAgICAgZGVsZXRlIHRoaXMuX2phdmFTY3JpcHRTb3VyY2VGcmFtZVN0YXRlOwogICAgIH0sCiAK QEAgLTM1Nyw2ICszNTgsMTIgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMudGV4dFZpZXdlci5lbmRVcGRhdGVzKCk7CiAgICAg fSwKIAorICAgIF9zZXRCcmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb25kaXRpb24s IGVuYWJsZWQpCisgICAgeworICAgICAgICB0aGlzLl9tb2RlbC5zZXRCcmVha3BvaW50KHRoaXMu X3VpU291cmNlQ29kZSwgbGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKTsKKyAgICAgICAg dGhpcy5fc2NyaXB0c1BhbmVsLmFjdGl2YXRlQnJlYWtwb2ludHMoKTsKKyAgICB9LAorCiAgICAg X29uTW91c2VEb3duOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIGlmIChldmVudC5i dXR0b24gIT0gMCB8fCBldmVudC5hbHRLZXkgfHwgZXZlbnQuY3RybEtleSB8fCBldmVudC5tZXRh S2V5KQpAQCAtMzczLDcgKzM4MCw3IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJh bWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHRoaXMu X21vZGVsLnJlbW92ZUJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyKTsK ICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5zZXRCcmVha3BvaW50 KGxpbmVOdW1iZXIsICIiLCB0cnVlKTsKKyAgICAgICAgICAgIHRoaXMuX3NldEJyZWFrcG9pbnQo bGluZU51bWJlciwgIiIsIHRydWUpOwogICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwog ICAgIH0sCiAKQEAgLTQ2NiwyNSArNDczLDMgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3Vy Y2VGcmFtZS5wcm90b3R5cGUgPSB7CiB9CiAKIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNl RnJhbWUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90 b3R5cGU7Ci0KLS8qKgotICogQGludGVyZmFjZQotICovCi1XZWJJbnNwZWN0b3IuSmF2YVNjcmlw dFNvdXJjZUZyYW1lRGVsZWdhdGUgPSBmdW5jdGlvbigpCi17Ci19Ci0KLVdlYkluc3BlY3Rvci5K YXZhU2NyaXB0U291cmNlRnJhbWVEZWxlZ2F0ZS5wcm90b3R5cGUgPSB7Ci0gICAgc2V0QnJlYWtw b2ludDogZnVuY3Rpb24obGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKSB7IH0sCi0KLSAg ICBzZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkOiBmdW5jdGlvbihpbkVkaXRNb2RlKSB7IH0s Ci0KLSAgICBzdWdnZXN0ZWRGaWxlTmFtZTogZnVuY3Rpb24oKSB7IH0sCi0KLSAgICBhZGRUb1dh dGNoOiBmdW5jdGlvbigpIHsgfQotfQotCi0vKioKLSAqIERlZmF1bHQgaW1wbGVtZW50YXRpb24u Ci0gKi8KLVdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWVEZWxlZ2F0ZS5zdHViID0g T2JqZWN0LmNyZWF0ZShXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lRGVsZWdhdGUu cHJvdG90eXBlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanMKaW5kZXggNmJlZDUxOWFkOTc2MTdiMDRlY2IxZWZhMTZmNTJkMjY3ZGM0 YjAxOC4uMGMxZDE2MmIzNTBmN2Q1YWZiYmM4ZmU0MWRlZTQ3MjdmYzg5YTg1MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAg LTIzNCw2ICsyMzQsMTIgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHJldHVybiB0aGlzLnRvZ2dsZUJyZWFrcG9pbnRzQnV0dG9uLnRvZ2dsZWQ7CiAg ICAgfSwKIAorICAgIGFjdGl2YXRlQnJlYWtwb2ludHM6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIGlmICghdGhpcy5icmVha3BvaW50c0FjdGl2YXRlZCkKKyAgICAgICAgICAgIHRoaXMuX3Rv Z2dsZUJyZWFrcG9pbnRzQ2xpY2tlZCgpOworICAgIH0sCisKICAgICBfdWlTb3VyY2VDb2RlQWRk ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IGV2 ZW50LmRhdGE7CkBAIC0zMDAsNyArMzA2LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUgPSB7CiAKICAgICAgICAgY29uc3QgaW5kZW50ID0gV2ViSW5zcGVjdG9yLmlzTWFj KCkgPyAiIiA6ICJcdTAwYTBcdTAwYTBcdTAwYTBcdTAwYTAiOwogCi0gICAgICAgIHZhciBuYW1l cyA9IHRoaXMuX2ZvbGRlckFuZERpc3BsYXlOYW1lRm9yU2NyaXB0VVJMKHVpU291cmNlQ29kZS51 cmwpOworICAgICAgICB2YXIgbmFtZXMgPSB0aGlzLmZvbGRlckFuZERpc3BsYXlOYW1lRm9yU2Ny aXB0VVJMKHVpU291cmNlQ29kZS51cmwpOwogICAgICAgICBvcHRpb24uZGlzcGxheU5hbWUgPSBu YW1lcy5kaXNwbGF5TmFtZTsKIAogICAgICAgICB2YXIgY29udGVudFNjcmlwdFByZWZpeCA9IHVp U291cmNlQ29kZS5pc0NvbnRlbnRTY3JpcHQgPyAiMjoiIDogIjA6IjsKQEAgLTM3MSw3ICszNzcs NyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdWlT b3VyY2VDb2RlLl9vcHRpb24gPSBvcHRpb247CiAgICAgfSwKIAotICAgIF9mb2xkZXJBbmREaXNw bGF5TmFtZUZvclNjcmlwdFVSTDogZnVuY3Rpb24odXJsKQorICAgIGZvbGRlckFuZERpc3BsYXlO YW1lRm9yU2NyaXB0VVJMOiBmdW5jdGlvbih1cmwpCiAgICAgewogICAgICAgICB2YXIgcGFyc2Vk VVJMID0gdXJsLmFzUGFyc2VkVVJMKCk7CiAgICAgICAgIGlmIChwYXJzZWRVUkwpCkBAIC0zOTks NyArNDA1LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHJldHVybiB7IGRvbWFpbjogKHBhcnNlZFVSTCA/IHBhcnNlZFVSTC5ob3N0IDogIiIpLCBm b2xkZXJOYW1lOiBmb2xkZXJOYW1lLCBkaXNwbGF5TmFtZTogZGlzcGxheU5hbWUgfTsKICAgICB9 LAogCi0gICAgX3NldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQ6IGZ1bmN0aW9uKHVpU291cmNl Q29kZSwgaW5FZGl0TW9kZSkKKyAgICBzZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkOiBmdW5j dGlvbih1aVNvdXJjZUNvZGUsIGluRWRpdE1vZGUpCiAgICAgewogICAgICAgICB2YXIgb3B0aW9u ID0gdWlTb3VyY2VDb2RlLl9vcHRpb247CiAgICAgICAgIGlmICghb3B0aW9uKQpAQCAtNjQ2LDgg KzY1Miw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAg X2NyZWF0ZVNvdXJjZUZyYW1lOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAgewotICAgICAg ICB2YXIgZGVsZWdhdGUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JT Y3JpcHRzUGFuZWwodGhpcywgdWlTb3VyY2VDb2RlKTsKLSAgICAgICAgdmFyIHNvdXJjZUZyYW1l ID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUoZGVsZWdhdGUsIHRoaXMu X3ByZXNlbnRhdGlvbk1vZGVsLCB1aVNvdXJjZUNvZGUpOworICAgICAgICB2YXIgc291cmNlRnJh bWUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZSh0aGlzLCB0aGlzLl9w cmVzZW50YXRpb25Nb2RlbCwgdWlTb3VyY2VDb2RlKTsKIAogICAgICAgICBzb3VyY2VGcmFtZS5f dWlTb3VyY2VDb2RlID0gdWlTb3VyY2VDb2RlOwogICAgICAgICBzb3VyY2VGcmFtZS5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5FdmVudHMuTG9hZGVkLCB0aGlzLl9z b3VyY2VGcmFtZUxvYWRlZCwgdGhpcyk7CkBAIC0xMTU0LDUwICsxMTU5LDEyIEBAIFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy5fdG9n Z2xlRm9ybWF0U291cmNlQnV0dG9uLnRvZ2dsZWQgPSAhdGhpcy5fdG9nZ2xlRm9ybWF0U291cmNl QnV0dG9uLnRvZ2dsZWQ7CiAgICAgICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNldEZvcm1h dFNvdXJjZSh0aGlzLl90b2dnbGVGb3JtYXRTb3VyY2VCdXR0b24udG9nZ2xlZCk7Ci0gICAgfQot fQotCi1XZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJ bnNwZWN0b3IuUGFuZWwucHJvdG90eXBlOwotCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgotICogQGlt cGxlbWVudHMge1dlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWVEZWxlZ2F0ZX0KLSAq IEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbH0gc2NyaXB0c1BhbmVsCi0gKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQotICovCi1XZWJJbnNw ZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHNjcmlw dHNQYW5lbCwgdWlTb3VyY2VDb2RlKQotewotICAgIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291 cmNlRnJhbWVEZWxlZ2F0ZS5jYWxsKHRoaXMpOwotCi0gICAgdGhpcy5fc2NyaXB0c1BhbmVsID0g c2NyaXB0c1BhbmVsOwotICAgIHRoaXMuX21vZGVsID0gdGhpcy5fc2NyaXB0c1BhbmVsLl9wcmVz ZW50YXRpb25Nb2RlbDsKLSAgICB0aGlzLl91aVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGU7Ci19 Ci0KLVdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3Rv dHlwZSA9IHsKLSAgICBzZXRCcmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb25kaXRp b24sIGVuYWJsZWQpCi0gICAgewotICAgICAgICB0aGlzLl9tb2RlbC5zZXRCcmVha3BvaW50KHRo aXMuX3VpU291cmNlQ29kZSwgbGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKTsKLQotICAg ICAgICBpZiAoIXRoaXMuX3NjcmlwdHNQYW5lbC5icmVha3BvaW50c0FjdGl2YXRlZCkKLSAgICAg ICAgICAgIHRoaXMuX3NjcmlwdHNQYW5lbC5fdG9nZ2xlQnJlYWtwb2ludHNDbGlja2VkKCk7Ci0g ICAgfSwKLQotICAgIHNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQ6IGZ1bmN0aW9uKGluRWRp dE1vZGUpCi0gICAgewotICAgICAgICB0aGlzLl9zY3JpcHRzUGFuZWwuX3NldFNjcmlwdFNvdXJj ZUlzQmVpbmdFZGl0ZWQodGhpcy5fdWlTb3VyY2VDb2RlLCBpbkVkaXRNb2RlKTsKLSAgICB9LAot Ci0gICAgc3VnZ2VzdGVkRmlsZU5hbWU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHZhciBu YW1lcyA9IHRoaXMuX3NjcmlwdHNQYW5lbC5fZm9sZGVyQW5kRGlzcGxheU5hbWVGb3JTY3JpcHRV UkwodGhpcy5fdWlTb3VyY2VDb2RlLnVybCk7Ci0gICAgICAgIHJldHVybiBuYW1lcy5kaXNwbGF5 TmFtZSB8fCAidW50aXRsZWQuanMiOwogICAgIH0sCiAKICAgICBhZGRUb1dhdGNoOiBmdW5jdGlv bihleHByZXNzaW9uKQogICAgIHsKLSAgICAgICAgdGhpcy5fc2NyaXB0c1BhbmVsLnNpZGViYXJQ YW5lcy53YXRjaEV4cHJlc3Npb25zLmFkZEV4cHJlc3Npb24oZXhwcmVzc2lvbik7CisgICAgICAg IHRoaXMuc2lkZWJhclBhbmVzLndhdGNoRXhwcmVzc2lvbnMuYWRkRXhwcmVzc2lvbihleHByZXNz aW9uKTsKICAgICB9CiB9CiAKLVdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2Ny aXB0c1BhbmVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNv dXJjZUZyYW1lRGVsZWdhdGUucHJvdG90eXBlOworV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZTsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCAzZDY1YzI3NzAxODkwNzM4YmZlMGUxMDkzNGU5NzczMjZkYWJhMWJlLi40NTdiNzg3NTgxNGM4 ZTBkOTAyYjE1MzczY2VmNGJmMzFlNzZlMTg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAKIDIwMTEt MTEtMDkgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAorICAgICAgICBX ZWIgSW5zcGVjdG9yOiBbcmVmYWN0b3JpbmddIGdldCByaWQgb2YgSmF2YVNjcmlwdFNvdXJjZUZy YW1lRGVsZWdhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTcxOTIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzOgorICAgICAgICAoaW5p dGlhbGl6ZV9EZWJ1Z2dlclRlc3QpOgorCisyMDExLTExLTA5ICBBbmRyZXkgS29zeWFrb3YgIDxj YXNlcUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogW3JlZmFjdG9yaW5n XSByZW1vdmUgYSBidW5jaCBvZiBtZXRob2RzIGZyb20gSmF2YVNjcmlwdFNvdXJjZUZyYW1lRGVs ZWdhdGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcx ODI2CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVn Z2VyLXRlc3QuanMgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10 ZXN0LmpzCmluZGV4IGJjMWQ1YmRkNzRkYjZmZmZlZTczNDRkNTFjNGI1NzNmMmQ2ZTg5MjYuLjIy NjhlZDQyOWUyZDc4ZGVlZjBkMThhYzFkNjhjNWUyZThjY2QzY2UgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMKKysrIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5qcwpAQCAtMjYsOSArMjYs NyBAQCBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlRGVidWdnZXJUZXN0ID0gZnVuY3Rpb24oKQogewog ICAgIHZhciBzY3JpcHRzUGFuZWwgPSBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHM7CiAKLSAg ICBpZiAoIXNjcmlwdHNQYW5lbC5icmVha3BvaW50c0FjdGl2YXRlZCkKLSAgICAgICAgc2NyaXB0 c1BhbmVsLnRvZ2dsZUJyZWFrcG9pbnRzQnV0dG9uLmVsZW1lbnQuY2xpY2soKTsKLQorICAgIHNj cmlwdHNQYW5lbC5hY3RpdmF0ZUJyZWFrcG9pbnRzKCk7CiAgICAgSW5zcGVjdG9yVGVzdC5yZXN1 bWVFeGVjdXRpb24oZGlzYWJsZURlYnVnZ2VyKTsKIAogICAgIGZ1bmN0aW9uIGRpc2FibGVEZWJ1 Z2dlcigpCkBAIC0xNzUsNyArMTczLDcgQEAgSW5zcGVjdG9yVGVzdC5zaG93U2NyaXB0U291cmNl ID0gZnVuY3Rpb24oc2NyaXB0TmFtZSwgY2FsbGJhY2spCiAKIEluc3BlY3RvclRlc3Quc2V0QnJl YWtwb2ludCA9IGZ1bmN0aW9uKHNvdXJjZUZyYW1lLCBsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVu YWJsZWQpCiB7Ci0gICAgc291cmNlRnJhbWUuX2RlbGVnYXRlLnNldEJyZWFrcG9pbnQobGluZU51 bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKTsKKyAgICBzb3VyY2VGcmFtZS5fc2V0QnJlYWtwb2lu dChsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpOwogfTsKIAogSW5zcGVjdG9yVGVzdC5y ZW1vdmVCcmVha3BvaW50ID0gZnVuY3Rpb24oc291cmNlRnJhbWUsIGxpbmVOdW1iZXIpCg==