80395 2012-03-06 00:54:21 -0800 Web Inspector: remove reference to RawSourceCode from UISourceCode. 2012-03-06 04:12:12 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 571608 0 podivilov 2012-03-06 00:54:21 -0800 Web Inspector: remove reference to RawSourceCode from UISourceCode. 571610 1 130325 podivilov 2012-03-06 00:57:08 -0800 Created attachment 130325 Patch 571662 2 130325 vsevik 2012-03-06 02:01:03 -0800 Comment on attachment 130325 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=130325&action=review > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:217 > + for (var i = 0; i < addedItems.length; ++i) We should probably process removedItems first and then addedItems. > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:274 > + var script = WebInspector.debuggerModel.scriptForSourceID(rawLocation.scriptId); Do you need script at all? Looks like scriptId is enough. 571709 3 130325 podivilov 2012-03-06 03:55:22 -0800 Comment on attachment 130325 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=130325&action=review >> Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:217 >> + for (var i = 0; i < addedItems.length; ++i) > > We should probably process removedItems first and then addedItems. Done. >> Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:274 >> + var script = WebInspector.debuggerModel.scriptForSourceID(rawLocation.scriptId); > > Do you need script at all? Looks like scriptId is enough. I think it should actually be "WebInspector.resourceForURL(script.sourceURL)" below. So I better keep the script. 571714 4 podivilov 2012-03-06 04:12:12 -0800 Committed r109899: <http://trac.webkit.org/changeset/109899> 130325 2012-03-06 00:57:08 -0800 2012-03-06 03:55:22 -0800 Patch bug-80395-20120306125706.patch text/plain 16223 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5ODcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc2YTc5YWU0YzZhMDkw MTI3MmFhMjQ5ZjRmNjY4ODRkOGJmNmZiZS4uOTUyYTI3Nzg1YjU5ZGE1ZjQxNTA1MjM1ZDE5Yzk5 ZjE1NDkzYWY5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAzLTA2ICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IHJlbW92ZSByZWZlcmVuY2UgdG8gUmF3U291cmNlQ29kZSBmcm9tIFVJU291cmNlQ29k ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwMzk1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2g6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9oYW5kbGVVSVNvdXJjZUNvZGVMaXN0Q2hhbmdl ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90 b3R5cGUuX3VpU291cmNlQ29kZUxpc3RDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fcmVzdG9yZUJyZWFrcG9pbnRzKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlw ZS5zZXRTY3JpcHRTb3VyY2UuZGlkRWRpdFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuc2V0U2NyaXB0U291cmNl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3Rv dHlwZS5jb250aW51ZVRvTGluZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX2RlYnVnZ2VyUmVzZXQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvUmF3U291cmNlQ29kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5S YXdTb3VyY2VDb2RlLnByb3RvdHlwZS5fY3JlYXRlVUlTb3VyY2VDb2RlKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGUpOgorCiAyMDEyLTAzLTA1ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmls b3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0b3AgdXNpbmcgUmF3 U291cmNlQ29kZSBpbiBCcmVha3BvaW50TWFuYWdlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9jb21waWxlLWZyb250LWVuZC5zaAppbmRleCAyMjJkZWZlOTk2YjM5ZmExM2UzZGZiYmNm MTZkZGVjYTZlMzVhNzVmLi43ZmYwZDU1NzE1YTI0MThlNDRhMGViYmI2ZGY0MzEyNjU0OTQ0ZGJl IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQu c2gKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoCkBA IC00NSw3ICs0NSw3IEBAIGphdmEgLWphciB+L2Nsb3N1cmUvY29tcGlsZXIuamFyIC0tc3VtbWFy eV9kZXRhaWxfbGV2ZWwgMyAtLWNvbXBpbGF0aW9uX2xldmVsIFNJCiAgICAgICAgIC0tanMgU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Vc2VyTWV0cmljcy5qcyBcCiAgICAgICAg IC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IYW5kbGVyUmVnaXN0cnku anMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5z cGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qcyBcCi0gICAgLS1tb2R1bGUganNtb2R1bGVfc2RrOjMz OmpzbW9kdWxlX2NvbW1vbiBcCisgICAgLS1tb2R1bGUganNtb2R1bGVfc2RrOjM0OmpzbW9kdWxl X2NvbW1vbiBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9JbnNwZWN0b3JCYWNrZW5kLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVNb2RlbC5qcyBcCiAgICAgICAgIC0tanMg U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db2xvci5qcyBcCkBAIC02OCw2ICs2 OCw3IEBAIGphdmEgLWphciB+L2Nsb3N1cmUvY29tcGlsZXIuamFyIC0tc3VtbWFyeV9kZXRhaWxf bGV2ZWwgMyAtLWNvbXBpbGF0aW9uX2xldmVsIFNJCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QbGFjYXJkLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcyBcCiAgICAgICAgIC0tanMgU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRGb3JtYXR0ZXIuanMgXAorICAg ICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0TWFwcGlu Zy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U aW1lbGluZU1hbmFnZXIuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVGltZWxpbmVNb2RlbC5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmpzIFwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwppbmRleCBlNGQwYmZmZmUwODBkNTkzYTY2YWUyNzVj MjU0NTNjMTMwNDQyMzJlLi5iOTAwM2FhYTQ1Mzg3M2Y0MzQxYWE5Zjk1MDFjZDFjYjViMWFjYWZm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCkBAIC00MCw2ICs0MCw3IEBAIFdlYklu c3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsID0gZnVuY3Rpb24oKQogICAgIHRoaXMu X3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHRJZCA9IHt9OwogICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGVG b3JVUkwgPSB7fTsKICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yRG9jdW1lbnRVUkwgPSB7fTsK KyAgICB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yVUlTb3VyY2VDb2RlID0gbmV3IE1hcCgpOwogICAg IHRoaXMuX3ByZXNlbnRhdGlvbkNhbGxGcmFtZXMgPSBbXTsKIAogICAgIHRoaXMuX2JyZWFrcG9p bnRNYW5hZ2VyID0gbmV3IFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlcihXZWJJbnNwZWN0 b3Iuc2V0dGluZ3MuYnJlYWtwb2ludHMsIHRoaXMuX2JyZWFrcG9pbnRBZGRlZC5iaW5kKHRoaXMp LCB0aGlzLl9icmVha3BvaW50UmVtb3ZlZC5iaW5kKHRoaXMpLCBXZWJJbnNwZWN0b3IuZGVidWdn ZXJNb2RlbCwgdGhpcyk7CkBAIC0xMTIsNyArMTEzLDggQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAqLwogICAgIHVpTG9jYXRpb25U b1Jhd0xvY2F0aW9uOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIsIGNvbHVtbk51 bWJlcikKICAgICB7Ci0gICAgICAgIHJldHVybiB1aVNvdXJjZUNvZGUucmF3U291cmNlQ29kZS51 aUxvY2F0aW9uVG9SYXdMb2NhdGlvbih1aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIsIGNvbHVtbk51 bWJlcik7CisgICAgICAgIHZhciByYXdTb3VyY2VDb2RlID0gdGhpcy5fcmF3U291cmNlQ29kZUZv clVJU291cmNlQ29kZS5nZXQodWlTb3VyY2VDb2RlKTsKKyAgICAgICAgcmV0dXJuIHJhd1NvdXJj ZUNvZGUudWlMb2NhdGlvblRvUmF3TG9jYXRpb24odWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyLCBj b2x1bW5OdW1iZXIpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTE2Nyw3ICsxNjksNyBAQCBXZWJJ bnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMuX2FkZFBlbmRpbmdDb25zb2xlTWVzc2FnZXNUb1NjcmlwdChzY3JpcHQpOwogCiAgICAg ICAgIGlmIChyYXdTb3VyY2VDb2RlLnVpU291cmNlQ29kZUxpc3QoKS5sZW5ndGgpCi0gICAgICAg ICAgICB0aGlzLl91aVNvdXJjZUNvZGVMaXN0Q2hhbmdlZChyYXdTb3VyY2VDb2RlLCBbXSk7Cisg ICAgICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGVMaXN0Q2hhbmdlZChyYXdTb3VyY2VDb2RlLCBb XSwgcmF3U291cmNlQ29kZS51aVNvdXJjZUNvZGVMaXN0KCkpOwogICAgICAgICByYXdTb3VyY2VD b2RlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUuRXZlbnRzLlVJ U291cmNlQ29kZUxpc3RDaGFuZ2VkLCB0aGlzLl9oYW5kbGVVSVNvdXJjZUNvZGVMaXN0Q2hhbmdl ZCwgdGhpcyk7CiAgICAgfSwKIApAQCAtMjAyLDE3ICsyMDQsMjEgQEAgV2ViSW5zcGVjdG9yLkRl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFy IHJhd1NvdXJjZUNvZGUgPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlfSAq LyBldmVudC50YXJnZXQ7CiAgICAgICAgIHZhciBvbGRVSVNvdXJjZUNvZGVMaXN0ID0gLyoqIEB0 eXBlIHtBcnJheS48V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZT59ICovIGV2ZW50LmRhdGFbIm9s ZFVJU291cmNlQ29kZUxpc3QiXTsKLSAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlTGlzdENoYW5n ZWQocmF3U291cmNlQ29kZSwgb2xkVUlTb3VyY2VDb2RlTGlzdCk7CisgICAgICAgIHRoaXMuX3Vp U291cmNlQ29kZUxpc3RDaGFuZ2VkKHJhd1NvdXJjZUNvZGUsIG9sZFVJU291cmNlQ29kZUxpc3Qs IHJhd1NvdXJjZUNvZGUudWlTb3VyY2VDb2RlTGlzdCgpKTsKICAgICB9LAogCiAgICAgLyoqCiAg ICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZX0gcmF3U291cmNlQ29kZQot ICAgICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fSBvbGRVSVNv dXJjZUNvZGVMaXN0CisgICAgICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVjdG9yLlVJU291cmNl Q29kZT59IHJlbW92ZWRJdGVtcworICAgICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGU+fSBhZGRlZEl0ZW1zCiAgICAgICovCi0gICAgX3VpU291cmNlQ29kZUxpc3RD aGFuZ2VkOiBmdW5jdGlvbihyYXdTb3VyY2VDb2RlLCBvbGRVSVNvdXJjZUNvZGVMaXN0KQorICAg IF91aVNvdXJjZUNvZGVMaXN0Q2hhbmdlZDogZnVuY3Rpb24ocmF3U291cmNlQ29kZSwgcmVtb3Zl ZEl0ZW1zLCBhZGRlZEl0ZW1zKQogICAgIHsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBv bGRVSVNvdXJjZUNvZGVMaXN0Lmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB2YXIgYnJlYWtw b2ludHMgPSB0aGlzLl9icmVha3BvaW50TWFuYWdlci5icmVha3BvaW50c0ZvclVJU291cmNlQ29k ZShvbGRVSVNvdXJjZUNvZGVMaXN0W2ldKTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBh ZGRlZEl0ZW1zLmxlbmd0aDsgKytpKQorICAgICAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZUZv clVJU291cmNlQ29kZS5wdXQoYWRkZWRJdGVtc1tpXSwgcmF3U291cmNlQ29kZSk7CisKKyAgICAg ICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZW1vdmVkSXRlbXMubGVuZ3RoOyArK2kpIHsKKyAgICAg ICAgICAgIHZhciBicmVha3BvaW50cyA9IHRoaXMuX2JyZWFrcG9pbnRNYW5hZ2VyLmJyZWFrcG9p bnRzRm9yVUlTb3VyY2VDb2RlKHJlbW92ZWRJdGVtc1tpXSk7CiAgICAgICAgICAgICBmb3IgKHZh ciBsaW5lTnVtYmVyIGluIGJyZWFrcG9pbnRzKSB7CiAgICAgICAgICAgICAgICAgdmFyIGJyZWFr cG9pbnQgPSBicmVha3BvaW50c1tsaW5lTnVtYmVyXTsKICAgICAgICAgICAgICAgICB0aGlzLl9i cmVha3BvaW50UmVtb3ZlZChicmVha3BvaW50KTsKQEAgLTIyMCwyNCArMjI2LDI1IEBAIFdlYklu c3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX3Jlc3RvcmVCcmVha3BvaW50cyhyYXdT b3VyY2VDb2RlKTsKKyAgICAgICAgdGhpcy5fcmVzdG9yZUJyZWFrcG9pbnRzKGFkZGVkSXRlbXMp OwogCi0gICAgICAgIHZhciB1aVNvdXJjZUNvZGVMaXN0ID0gcmF3U291cmNlQ29kZS51aVNvdXJj ZUNvZGVMaXN0KCk7Ci0gICAgICAgIGlmICghb2xkVUlTb3VyY2VDb2RlTGlzdC5sZW5ndGgpIHsK LSAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdWlTb3VyY2VDb2RlTGlzdC5sZW5ndGg7 ICsraSkKLSAgICAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJ bnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuVUlTb3VyY2VDb2RlQWRk ZWQsIHVpU291cmNlQ29kZUxpc3RbaV0pOworICAgICAgICBpZiAoIXJlbW92ZWRJdGVtcy5sZW5n dGgpIHsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYWRkZWRJdGVtcy5sZW5ndGg7 ICsraSkKKyAgICAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJ bnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuVUlTb3VyY2VDb2RlQWRk ZWQsIGFkZGVkSXRlbXNbaV0pOworICAgICAgICB9IGVsc2UgaWYgKCFhZGRlZEl0ZW1zLmxlbmd0 aCkgeworICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBhZGRlZEl0ZW1zLmxlbmd0aDsg KytpKQorICAgICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYklu c3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5VSVNvdXJjZUNvZGVSZW1v dmVkLCByZW1vdmVkSXRlbXNbaV0pOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdmFy IGV2ZW50RGF0YSA9IHsgdWlTb3VyY2VDb2RlTGlzdDogdWlTb3VyY2VDb2RlTGlzdCwgb2xkVUlT b3VyY2VDb2RlTGlzdDogb2xkVUlTb3VyY2VDb2RlTGlzdCB9OworICAgICAgICAgICAgdmFyIGV2 ZW50RGF0YSA9IHsgdWlTb3VyY2VDb2RlTGlzdDogYWRkZWRJdGVtcywgb2xkVUlTb3VyY2VDb2Rl TGlzdDogcmVtb3ZlZEl0ZW1zIH07CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xp c3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuVUlT b3VyY2VDb2RlUmVwbGFjZWQsIGV2ZW50RGF0YSk7CiAgICAgICAgIH0KICAgICB9LAogCiAgICAg LyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZX0gcmF3U291cmNl Q29kZQorICAgICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fSB1 aVNvdXJjZUNvZGVMaXN0CiAgICAgICovCi0gICAgX3Jlc3RvcmVCcmVha3BvaW50czogZnVuY3Rp b24ocmF3U291cmNlQ29kZSkKKyAgICBfcmVzdG9yZUJyZWFrcG9pbnRzOiBmdW5jdGlvbih1aVNv dXJjZUNvZGVMaXN0KQogICAgIHsKLSAgICAgICAgdmFyIHVpU291cmNlQ29kZUxpc3QgPSByYXdT b3VyY2VDb2RlLnVpU291cmNlQ29kZUxpc3QoKTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCB1aVNvdXJjZUNvZGVMaXN0Lmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgdWlTb3Vy Y2VDb2RlID0gdWlTb3VyY2VDb2RlTGlzdFtpXTsKICAgICAgICAgICAgIHRoaXMuX2JyZWFrcG9p bnRNYW5hZ2VyLnVpU291cmNlQ29kZUFkZGVkKHVpU291cmNlQ29kZSk7CkBAIC0yNjMsOCArMjcw LDggQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0g ewogICAgICAqLwogICAgIHNldFNjcmlwdFNvdXJjZTogZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBu ZXdTb3VyY2UsIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgdmFyIHJhd1NvdXJjZUNvZGUgPSB1 aVNvdXJjZUNvZGUucmF3U291cmNlQ29kZTsKLSAgICAgICAgdmFyIHNjcmlwdCA9IHRoaXMuX3Nj cmlwdEZvclJhd1NvdXJjZUNvZGUocmF3U291cmNlQ29kZSk7CisgICAgICAgIHZhciByYXdMb2Nh dGlvbiA9IHRoaXMudWlMb2NhdGlvblRvUmF3TG9jYXRpb24odWlTb3VyY2VDb2RlLCAwLCAwKTsK KyAgICAgICAgdmFyIHNjcmlwdCA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnNjcmlwdEZv clNvdXJjZUlEKHJhd0xvY2F0aW9uLnNjcmlwdElkKTsKIAogICAgICAgICAvKioKICAgICAgICAg ICogQHRoaXMge1dlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsfQpAQCAtMjc2 LDcgKzI4Myw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIGlmIChlcnJvcikKICAgICAgICAgICAgICAgICByZXR1cm47 CiAKLSAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVS TChyYXdTb3VyY2VDb2RlLnVybCk7CisgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNw ZWN0b3IucmVzb3VyY2VGb3JVUkwodWlTb3VyY2VDb2RlLnVybCk7CiAgICAgICAgICAgICBpZiAo cmVzb3VyY2UpCiAgICAgICAgICAgICAgICAgcmVzb3VyY2UuYWRkUmV2aXNpb24obmV3U291cmNl KTsKIApAQCAtNDIxLDcgKzQyOCw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlv bk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBjb250aW51ZVRvTGluZTogZnVuY3Rp b24odWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyKQogICAgIHsKLSAgICAgICAgdmFyIHJhd0xvY2F0 aW9uID0gdWlTb3VyY2VDb2RlLnJhd1NvdXJjZUNvZGUudWlMb2NhdGlvblRvUmF3TG9jYXRpb24o dWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyLCAwKTsKKyAgICAgICAgdmFyIHJhd0xvY2F0aW9uID0g dGhpcy51aUxvY2F0aW9uVG9SYXdMb2NhdGlvbih1aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIsIDAp OwogICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5jb250aW51ZVRvTG9jYXRpb24o cmF3TG9jYXRpb24pOwogICAgIH0sCiAKQEAgLTU2OCw3ICs1NzUsNyBAQCBXZWJJbnNwZWN0b3Iu RGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlz Ll9leGVjdXRpb25MaW5lTGl2ZUxvY2F0aW9uKQogICAgICAgICAgICAgdGhpcy5fZXhlY3V0aW9u TGluZUxpdmVMb2NhdGlvbi5kaXNwb3NlKCk7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9leGVjdXRp b25MaW5lTGl2ZUxvY2F0aW9uOwotICAgICAgICAKKwogICAgICAgICB0aGlzLl9zZWxlY3RlZENh bGxGcmFtZSA9IGNhbGxGcmFtZTsKICAgICAgICAgaWYgKCF0aGlzLl9zZWxlY3RlZENhbGxGcmFt ZSkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTY1OCwyMyArNjY1LDYgQEAgV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAv KioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlfSByYXdTb3VyY2VD b2RlCi0gICAgICovCi0gICAgX3NjcmlwdEZvclJhd1NvdXJjZUNvZGU6IGZ1bmN0aW9uKHJhd1Nv dXJjZUNvZGUpCi0gICAgewotICAgICAgICAvKioKLSAgICAgICAgICogQHRoaXMge1dlYkluc3Bl Y3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsfQotICAgICAgICAgKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5TY3JpcHR9IHNjcmlwdAotICAgICAgICAgKiBAcmV0dXJuIHtib29sZWFufQotICAg ICAgICAgKi8KLSAgICAgICAgZnVuY3Rpb24gZmlsdGVyKHNjcmlwdCkKLSAgICAgICAgewotICAg ICAgICAgICAgcmV0dXJuIHNjcmlwdC5zY3JpcHRJZCA9PT0gcmF3U291cmNlQ29kZS5pZDsKLSAg ICAgICAgfQotICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwucXVlcnlT Y3JpcHRzKGZpbHRlci5iaW5kKHRoaXMpKVswXTsKLSAgICB9LAotCi0gICAgLyoqCiAgICAgICog QHBhcmFtIHtzdHJpbmd9IHVybAogICAgICAqIEBwYXJhbSB7RGVidWdnZXJBZ2VudC5Mb2NhdGlv bn0gcmF3TG9jYXRpb24KICAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuU2NyaXB0fQpAQCAt Njk3LDE1ICs2ODcsMTQgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwu cHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9y YXdTb3VyY2VDb2Rlcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgdmFyIHJhd1NvdXJjZUNv ZGUgPSB0aGlzLl9yYXdTb3VyY2VDb2Rlc1tpXTsKLSAgICAgICAgICAgIHZhciB1aVNvdXJjZUNv ZGVMaXN0ID0gcmF3U291cmNlQ29kZS51aVNvdXJjZUNvZGVMaXN0KCk7Ci0gICAgICAgICAgICBm b3IgKHZhciBqID0gMDsgaiA8IHVpU291cmNlQ29kZUxpc3QubGVuZ3RoOyArK2opCi0gICAgICAg ICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLlVJU291cmNlQ29kZVJlbW92ZWQsIHVpU291cmNl Q29kZUxpc3Rbal0pOworICAgICAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlTGlzdENoYW5nZWQo cmF3U291cmNlQ29kZSwgcmF3U291cmNlQ29kZS51aVNvdXJjZUNvZGVMaXN0KCksIFtdKTsKICAg ICAgICAgICAgIHJhd1NvdXJjZUNvZGUucmVtb3ZlQWxsTGlzdGVuZXJzKCk7CiAgICAgICAgIH0K ICAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZXMgPSBbXTsKICAgICAgICAgdGhpcy5fcmF3U291 cmNlQ29kZUZvclNjcmlwdElkID0ge307CiAgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JV UkwgPSB7fTsKICAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZUZvckRvY3VtZW50VVJMID0ge307 CisgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JVSVNvdXJjZUNvZGUuY2xlYXIoKTsKICAg ICAgICAgdGhpcy5fcHJlc2VudGF0aW9uQ2FsbEZyYW1lcyA9IFtdOwogICAgICAgICB0aGlzLl9z ZWxlY3RlZENhbGxGcmFtZSA9IG51bGw7CiAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRNYW5hZ2Vy LmRlYnVnZ2VyUmVzZXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmF3U291cmNlQ29kZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmF3U291cmNlQ29kZS5qcwppbmRleCBmNjllNmEzZWYzOWZkMmNlYzkwNDhiOGVjNDZl NzQ5NTQ5MmY4OTMwLi4xMzU0NGU2YjdmYTBkNmE1NmRhNzhiYzFlNzJjNzYxOWJlZmFlZjQyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jhd1NvdXJjZUNv ZGUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SYXdTb3VyY2VD b2RlLmpzCkBAIC0yNjEsNyArMjYxLDcgQEAgV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUucHJv dG90eXBlID0gewogICAgICAqLwogICAgIF9jcmVhdGVVSVNvdXJjZUNvZGU6IGZ1bmN0aW9uKGlk LCB1cmwsIGNvbnRlbnRQcm92aWRlcikKICAgICB7Ci0gICAgICAgIHZhciB1aVNvdXJjZUNvZGUg PSBuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZShpZCwgdXJsLCB0aGlzLCBjb250ZW50UHJv dmlkZXIpOworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGUoaWQsIHVybCwgY29udGVudFByb3ZpZGVyKTsKICAgICAgICAgdWlTb3VyY2VDb2Rl LmlzQ29udGVudFNjcmlwdCA9IHRoaXMuaXNDb250ZW50U2NyaXB0OwogICAgICAgICB1aVNvdXJj ZUNvZGUuaXNFZGl0YWJsZSA9IHRoaXMuX3NjcmlwdHMubGVuZ3RoID09PSAxICYmICF0aGlzLl9z Y3JpcHRzWzBdLmxpbmVPZmZzZXQgJiYgIXRoaXMuX3NjcmlwdHNbMF0uY29sdW1uT2Zmc2V0CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJiYgIXRoaXMuX2Zvcm1hdHRlZCAmJiAh dGhpcy5fY29tcGlsZXJTb3VyY2VNYXBwaW5nOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcwppbmRleCBkNWE1MDUzZmNhYmQwOTI0YWQ3 YzcxY2YzMDZkODQyOTg1N2FjMDIxLi43NWFiYmQ2Mzc1YTc5NTA1NDc2OWRhY2FhZTgxZWQzMzQ3 ZDA2ZDk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJ U291cmNlQ29kZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJ U291cmNlQ29kZS5qcwpAQCAtMzMsMTQgKzMzLDEyIEBACiAgKiBAZXh0ZW5kcyB7V2ViSW5zcGVj dG9yLk9iamVjdH0KICAqIEBwYXJhbSB7c3RyaW5nfSBpZAogICogQHBhcmFtIHtzdHJpbmd9IHVy bAotICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZX0gcmF3U291cmNlQ29kZQog ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQ29udGVudFByb3ZpZGVyfSBjb250ZW50UHJvdmlkZXIK ICAqLwotV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZSA9IGZ1bmN0aW9uKGlkLCB1cmwsIHJhd1Nv dXJjZUNvZGUsIGNvbnRlbnRQcm92aWRlcikKK1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUgPSBm dW5jdGlvbihpZCwgdXJsLCBjb250ZW50UHJvdmlkZXIpCiB7CiAgICAgdGhpcy5faWQgPSBpZDsK ICAgICB0aGlzLl91cmwgPSB1cmw7Ci0gICAgdGhpcy5fcmF3U291cmNlQ29kZSA9IHJhd1NvdXJj ZUNvZGU7CiAgICAgdGhpcy5fY29udGVudFByb3ZpZGVyID0gY29udGVudFByb3ZpZGVyOwogICAg IHRoaXMuaXNDb250ZW50U2NyaXB0ID0gZmFsc2U7CiAgICAgdGhpcy5pc0VkaXRhYmxlID0gZmFs c2U7CkBAIC03MiwxNCArNzAsNiBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlw ZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlJh d1NvdXJjZUNvZGV9Ci0gICAgICovCi0gICAgZ2V0IHJhd1NvdXJjZUNvZGUoKQotICAgIHsKLSAg ICAgICAgcmV0dXJuIHRoaXMuX3Jhd1NvdXJjZUNvZGU7Ci0gICAgfSwKLQotICAgIC8qKgogICAg ICAqIEBwYXJhbSB7ZnVuY3Rpb24oc3RyaW5nLHN0cmluZyl9IGNhbGxiYWNrCiAgICAgICovCiAg ICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGFmY2RjMGE0NzY5 Yjk4NzVhMTNlNjk2ODI2NzNlZGI5MWNmYTI0ZmIuLmU2NjRlMzg4ZDM5N2UzNzNhZDE4NmZmMWZk NDZkMGJmZDI2MzMwNGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wMy0wNiAgUGF2ZWwg UG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiByZW1vdmUgcmVmZXJlbmNlIHRvIFJhd1NvdXJjZUNvZGUgZnJvbSBVSVNvdXJjZUNvZGUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDM5NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVj dG9yL2RlYnVnZ2VyL3Jhdy1zb3VyY2UtY29kZS5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9k ZWJ1Z2dlci91aS1zb3VyY2UtY29kZS5odG1sOgorCiAyMDEyLTAzLTA1ICBQYXZlbCBQb2Rpdmls b3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN0 b3AgdXNpbmcgUmF3U291cmNlQ29kZSBpbiBCcmVha3BvaW50TWFuYWdlci4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9yYXctc291cmNlLWNvZGUuaHRtbCBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9yYXctc291cmNlLWNvZGUuaHRtbAppbmRleCAw ZjU0MTI1YTk1NTIzNzc4MmFlMTBjYTQwNDBjMWVhZWE1Zjc1MjQxLi4wN2I5ZjFjMDk0OTliOTY1 YjhlNmMyOWMwOTljOTk2N2RhNTFhODUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXIvcmF3LXNvdXJjZS1jb2RlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyL3Jhdy1zb3VyY2UtY29kZS5odG1sCkBAIC0xMDksNyArMTA5LDYgQEAgZnVu Y3Rpb24gdGVzdCgpCiAgICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gcmF3U291cmNlQ29k ZS51aVNvdXJjZUNvZGVMaXN0KClbMF07CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2Vy dEVxdWFscygiZm9vLmpzIiwgdWlTb3VyY2VDb2RlLnVybCk7CiAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmFzc2VydEVxdWFscyh0cnVlLCB1aVNvdXJjZUNvZGUuaXNDb250ZW50U2NyaXB0KTsK LSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKHJhd1NvdXJjZUNvZGUsIHVp U291cmNlQ29kZS5yYXdTb3VyY2VDb2RlKTsKICAgICAgICAgICAgIGNoZWNrVUlMb2NhdGlvbih1 aVNvdXJjZUNvZGUsIDAsIDUsIHJhd1NvdXJjZUNvZGUucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24o Y3JlYXRlUmF3TG9jYXRpb24oMCwgNSkpKTsKICAgICAgICAgICAgIGNoZWNrUmF3TG9jYXRpb24o c2NyaXB0LCAxMCwgMCwgcmF3U291cmNlQ29kZS51aUxvY2F0aW9uVG9SYXdMb2NhdGlvbih1aVNv dXJjZUNvZGUsIDEwLCAwKSk7CiAgICAgICAgICAgICB1aVNvdXJjZUNvZGUucmVxdWVzdENvbnRl bnQoZGlkUmVxdWVzdENvbnRlbnQpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3VpLXNvdXJjZS1jb2RlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVi dWdnZXIvdWktc291cmNlLWNvZGUuaHRtbAppbmRleCA4MGUzMzQxMjVlNmY1YTBmMGNmNDI1MGYw OTdhMDQ0ODk2NjEyNzk0Li42ZTlhN2EzNzgxNzM5YjdkOGRlNWJmZjQxODk1ZGE5ZGIwMzcxOTI3 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvdWktc291cmNlLWNv ZGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvdWktc291cmNlLWNv ZGUuaHRtbApAQCAtMTcsNyArMTcsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICBJbnNwZWN0b3JU ZXN0LnJ1blRlc3RTdWl0ZShbCiAgICAgICAgIGZ1bmN0aW9uIHRlc3RVSVNvdXJjZUNvZGUobmV4 dCkKICAgICAgICAgewotICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNw ZWN0b3IuVUlTb3VyY2VDb2RlKCJpZCIsICJ1cmwiLCBudWxsLCBjb250ZW50UHJvdmlkZXIpOwor ICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlKCJpZCIsICJ1cmwiLCBjb250ZW50UHJvdmlkZXIpOwogICAgICAgICAgICAgZnVuY3Rpb24g ZGlkUmVxdWVzdENvbnRlbnQoY2FsbE51bWJlciwgbWltZVR5cGUsIGNvbnRlbnQpCiAgICAgICAg ICAgICB7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIkNhbGxiYWNr ICIgKyBjYWxsTnVtYmVyICsgIiBpcyBpbnZva2VkLiIpOwo=