58659 2011-04-15 06:57:27 -0700 Web Inspector: make resource revisions use dedicated type (not Resource clone). 2011-04-15 07:08:57 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 386573 0 pfeldman 2011-04-15 06:57:27 -0700 Patch to follow. 386577 1 89781 pfeldman 2011-04-15 07:00:04 -0700 Created attachment 89781 Patch 386583 2 89781 yurys 2011-04-15 07:06:29 -0700 Comment on attachment 89781 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89781&action=review > Source/WebCore/inspector/front-end/Resource.js:838 > + if (typeof this._content === "string") { Please comment on the logic here. 386592 3 pfeldman 2011-04-15 07:08:57 -0700 Committed r83969: <http://trac.webkit.org/changeset/83969> 89781 2011-04-15 07:00:04 -0700 2011-04-15 07:06:29 -0700 Patch bug-58659-20110415180000.patch text/plain 17106 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODM5NjIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzYTMyNjk4NWYyY2UzMTM0 ZDVlMjM5YjM2MGQwZjZiNDAyOWQyYWRhLi4zZDU4NDY2YmE2ZmUwMDRiMzhhNjIwNTJkMGE1MTYz ZmEwNzMyMmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNTEgQEAKIDIwMTEtMDQtMTUgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1ha2UgcmVzb3VyY2UgcmV2 aXNpb25zIHVzZSBkZWRpY2F0ZWQgdHlwZSAobm90IFJlc291cmNlIGNsb25lKS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4NjU5CisKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUuc2V0U3R5bGVTaGVldFRleHQpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUmVzb3VyY2UucHJvdG90eXBlLmFkZFJldmlzaW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZS5wcm90b3R5cGUuX2lubmVyUmVxdWVzdENvbnRlbnQub25SZXNvdXJjZUNvbnRl bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5faW5uZXJSZXF1 ZXN0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VSZXZpc2lvbik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VSZXZpc2lvbi5wcm90b3R5cGUuZ2V0IHJlc291 cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVJldmlzaW9uLnByb3RvdHlwZS5n ZXQgdGltZXN0YW1wKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVJldmlzaW9uLnBy b3RvdHlwZS5nZXQgY29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VSZXZp c2lvbi5wcm90b3R5cGUucmV2ZXJ0VG9UaGlzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNv dXJjZVJldmlzaW9uLnByb3RvdHlwZS5yZXF1ZXN0Q29udGVudC5teWNhbGxiYWNrKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVJldmlzaW9uLnByb3RvdHlwZS5yZXF1ZXN0Q29udGVu dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnJlc291cmNlVmlld1R5cGVNYXRjaGVzUmVz b3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5yZXNvdXJjZVZpZXdG b3JSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnJlY3JlYXRl UmVzb3VyY2VWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcuZXhpc3Rp bmdSZXNvdXJjZVZpZXdGb3JSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmV2aXNp b25Tb3VyY2VGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmV2aXNpb25Tb3VyY2VGcmFt ZS5wcm90b3R5cGUuZ2V0IHJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXZpc2lv blNvdXJjZUZyYW1lLnByb3RvdHlwZS5pc0NvbnRlbnRFZGl0YWJsZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmV2aXNpb25Tb3VyY2VGcmFtZS5wcm90b3R5cGUucmVxdWVzdENvbnRlbnQpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9zaG93UmVzb3VyY2VWaWV3 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX3Nob3dS ZXZpc2lvblZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3Rv dHlwZS5fZmV0Y2hBbmRBcHBseURpZmZNYXJrdXAuc3RlcDEpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fZmV0Y2hBbmRBcHBseURpZmZNYXJrdXAuc3Rl cDIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fZmV0 Y2hBbmRBcHBseURpZmZNYXJrdXApOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlUmV2 aXNpb25UcmVlRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VSZXZpc2lv blRyZWVFbGVtZW50LnByb3RvdHlwZS5nZXQgaXRlbVVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUmVzb3VyY2VSZXZpc2lvblRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VSZXZpc2lvblRyZWVFbGVtZW50LnByb3RvdHlwZS5f b25kcmFnc3RhcnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlUmV2aXNpb25UcmVl RWxlbWVudC5wcm90b3R5cGUuX2hhbmRsZUNvbnRleHRNZW51RXZlbnQpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWUucHJvdG90eXBlLl9lbnN1cmVDb250ZW50TG9hZGVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUucmVxdWVzdENvbnRlbnQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5jb21taXRFZGl0aW5nLmRpZEVk aXRDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUu Y29tbWl0RWRpdGluZyk6CisKKzIwMTEtMDQtMTUgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBn b29nbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogcmVmYWN0b3IgcmVzb3VyY2Ugc2V0Q29udGVudCAvIHJldmlz aW9ucyBpbmZyYXN0cnVjdHVyZSB0byBnZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcwppbmRleCAyYjEyZjJmY2I2Zjg4ZmRiZjUy ODU5MDMwMjc5NmY0MGRiMWEyMWQ4Li4xZDMyODFiNDkxMGFjNzUxYjEzYjFjOTI0MDQ5N2I4YTcx ZTAzNzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NT U1N0eWxlTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D U1NTdHlsZU1vZGVsLmpzCkBAIC0xODcsNyArMTg3LDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxl TW9kZWwucHJvdG90eXBlID0gewogICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhlcnJvcikKICAg ICAgICAgewogICAgICAgICAgICAgIGlmICghZXJyb3IpCi0gICAgICAgICAgICAgICAgIHRoaXMu X2ZpcmVTdHlsZVNoZWV0Q2hhbmdlZCh0aGlzLmlkLCBtYWpvckNoYW5nZSk7CisgICAgICAgICAg ICAgICAgIHRoaXMuX2ZpcmVTdHlsZVNoZWV0Q2hhbmdlZChzdHlsZVNoZWV0SWQsIG1ham9yQ2hh bmdlKTsKIAogICAgICAgICAgICAgIGlmICh1c2VyQ2FsbGJhY2spCiAgICAgICAgICAgICAgICAg IHVzZXJDYWxsYmFjayhlcnJvcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZS5qcwppbmRleCBkZDExOWNhNDE5N2QwZGQ2YmQ3NDRiZTM2NGE3ZTAzZGU5 MzFjNjYzLi41YTJhMWY3NTFiY2Q1NGQ4ODI1N2M2NWRmNzQ5NDYwYjM2MmI2ZGQ2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKQEAgLTcyMyw1 NSArNzIzLDEzIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAKICAgICBh ZGRSZXZpc2lvbjogZnVuY3Rpb24obmV3Q29udGVudCkKICAgICB7Ci0gICAgICAgIHZhciByZXZp c2lvblJlc291cmNlID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZShudWxsLCB0aGlzLnVybCk7 Ci0gICAgICAgIHJldmlzaW9uUmVzb3VyY2UuZnJhbWVJZCA9IHRoaXMuZnJhbWVJZDsKLSAgICAg ICAgcmV2aXNpb25SZXNvdXJjZS5sb2FkZXJJZCA9IHRoaXMubG9hZGVySWQ7Ci0gICAgICAgIHJl dmlzaW9uUmVzb3VyY2UuZG9jdW1lbnRVUkwgPSB0aGlzLmRvY3VtZW50VVJMOwotICAgICAgICBy ZXZpc2lvblJlc291cmNlLnR5cGUgPSB0aGlzLnR5cGU7Ci0gICAgICAgIHJldmlzaW9uUmVzb3Vy Y2UubG9hZGVyID0gdGhpcy5sb2FkZXI7Ci0gICAgICAgIHJldmlzaW9uUmVzb3VyY2UudGltZXN0 YW1wID0gdGhpcy50aW1lc3RhbXA7Ci0gICAgICAgIHJldmlzaW9uUmVzb3VyY2UuX2NvbnRlbnQg PSB0aGlzLl9jb250ZW50OwotICAgICAgICByZXZpc2lvblJlc291cmNlLl9hY3R1YWxSZXNvdXJj ZSA9IHRoaXM7Ci0KLSAgICAgICAgaWYgKHRoaXMuZmluaXNoZWQpCi0gICAgICAgICAgICByZXZp c2lvblJlc291cmNlLmZpbmlzaGVkID0gdHJ1ZTsKLSAgICAgICAgZWxzZSB7Ci0gICAgICAgICAg ICBmdW5jdGlvbiBmaW5pc2hlZCgpCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgdGhp cy5yZW1vdmVFdmVudExpc3RlbmVyKCJmaW5pc2hlZCIsIGZpbmlzaGVkKTsKLSAgICAgICAgICAg ICAgICByZXZpc2lvblJlc291cmNlLmZpbmlzaGVkID0gdHJ1ZTsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIHRoaXMuYWRkRXZlbnRMaXN0ZW5lcigiZmluaXNoZWQiLCBmaW5pc2hlZC5iaW5k KHRoaXMpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGlmICghdGhpcy5fYmFzZVJldmlzaW9uKQot ICAgICAgICAgICAgdGhpcy5fYmFzZVJldmlzaW9uID0gcmV2aXNpb25SZXNvdXJjZTsKLSAgICAg ICAgZWxzZQotICAgICAgICAgICAgcmV2aXNpb25SZXNvdXJjZS5fYmFzZVJldmlzaW9uID0gdGhp cy5fYmFzZVJldmlzaW9uOworICAgICAgICB2YXIgcmV2aXNpb24gPSBuZXcgV2ViSW5zcGVjdG9y LlJlc291cmNlUmV2aXNpb24odGhpcywgdGhpcy5fY29udGVudCwgdGhpcy5fY29udGVudFRpbWVz dGFtcCk7CisgICAgICAgIHRoaXMuaGlzdG9yeS5wdXNoKHJldmlzaW9uKTsKIAogICAgICAgICB0 aGlzLl9jb250ZW50ID0gbmV3Q29udGVudDsKLSAgICAgICAgdGhpcy50aW1lc3RhbXAgPSBuZXcg RGF0ZSgpOwotCi0gICAgICAgIHRoaXMuaGlzdG9yeS5wdXNoKHJldmlzaW9uUmVzb3VyY2UpOwot ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3Vy Y2UuRXZlbnRzLlJldmlzaW9uQWRkZWQsIHJldmlzaW9uUmVzb3VyY2UpOwotICAgIH0sCi0KLSAg ICByZXZlcnRUb1RoaXM6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fYWN0 dWFsUmVzb3VyY2UpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgZnVuY3Rpb24gY2Fs bGJhY2soY29udGVudCkKLSAgICAgICAgewotICAgICAgICAgICAgaWYgKGNvbnRlbnQpCi0gICAg ICAgICAgICAgICAgdGhpcy5fYWN0dWFsUmVzb3VyY2Uuc2V0Q29udGVudChjb250ZW50LCB0cnVl KTsKLSAgICAgICAgfQotICAgICAgICB0aGlzLnJlcXVlc3RDb250ZW50KGNhbGxiYWNrLmJpbmQo dGhpcykpOwotICAgIH0sCisgICAgICAgIHRoaXMuX2NvbnRlbnRUaW1lc3RhbXAgPSBuZXcgRGF0 ZSgpOwogCi0gICAgZ2V0IGJhc2VSZXZpc2lvbigpCi0gICAgewotICAgICAgICByZXR1cm4gdGhp cy5fYmFzZVJldmlzaW9uOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuUmVzb3VyY2UuRXZlbnRzLlJldmlzaW9uQWRkZWQsIHJldmlzaW9uKTsKICAg ICB9LAogCiAgICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQpAQCAtODMwLDYg Kzc4OCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZ1 bmN0aW9uIG9uUmVzb3VyY2VDb250ZW50KGRhdGEpCiAgICAgICAgIHsKICAgICAgICAgICAgIHRo aXMuX2NvbnRlbnQgPSBkYXRhOworICAgICAgICAgICAgdGhpcy5fb3JpZ2luYWxDb250ZW50ID0g ZGF0YTsKICAgICAgICAgICAgIHZhciBjYWxsYmFja3MgPSB0aGlzLl9wZW5kaW5nQ29udGVudENh bGxiYWNrcy5zbGljZSgpOwogICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBjYWxsYmFj a3MubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICAgICAgY2FsbGJhY2tzW2ldKHRoaXMuX2NvbnRl bnQsIHRoaXMuX2NvbnRlbnRFbmNvZGVkKTsKQEAgLTg0Miw2ICs4MDEsNTkgQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKIAogV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3Rv dHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKIAorV2ViSW5z cGVjdG9yLlJlc291cmNlUmV2aXNpb24gPSBmdW5jdGlvbihyZXNvdXJjZSwgY29udGVudCwgdGlt ZXN0YW1wKQoreworICAgIHRoaXMuX3Jlc291cmNlID0gcmVzb3VyY2U7CisgICAgdGhpcy5fY29u dGVudCA9IGNvbnRlbnQ7CisgICAgdGhpcy5fdGltZXN0YW1wID0gdGltZXN0YW1wOworfQorCitX ZWJJbnNwZWN0b3IuUmVzb3VyY2VSZXZpc2lvbi5wcm90b3R5cGUgPSB7CisgICAgZ2V0IHJlc291 cmNlKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9yZXNvdXJjZTsKKyAgICB9LAorCisg ICAgZ2V0IHRpbWVzdGFtcCgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fdGltZXN0YW1w OworICAgIH0sCisKKyAgICBnZXQgY29udGVudCgpCisgICAgeworICAgICAgICByZXR1cm4gdGhp cy5fY29udGVudDsKKyAgICB9LAorCisgICAgcmV2ZXJ0VG9UaGlzOiBmdW5jdGlvbigpCisgICAg eworICAgICAgICBmdW5jdGlvbiByZXZlcnQoY29udGVudCkKKyAgICAgICAgeworICAgICAgICAg ICAgdGhpcy5fcmVzb3VyY2Uuc2V0Q29udGVudChjb250ZW50LCB0cnVlKTsKKyAgICAgICAgfQor ICAgICAgICB0aGlzLnJlcXVlc3RDb250ZW50KHJldmVydC5iaW5kKHRoaXMpKTsKKyAgICB9LAor CisgICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAg aWYgKHR5cGVvZiB0aGlzLl9jb250ZW50ID09PSAic3RyaW5nIikgeworICAgICAgICAgICAgY2Fs bGJhY2sodGhpcy5fY29udGVudCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKwor ICAgICAgICBpZiAodHlwZW9mIHRoaXMucmVzb3VyY2UuX29yaWdpbmFsQ29udGVudCA9PT0gInN0 cmluZyIpIHsKKyAgICAgICAgICAgIHRoaXMuX2NvbnRlbnQgPSB0aGlzLl9yZXNvdXJjZS5fb3Jp Z2luYWxDb250ZW50OworICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5fY29udGVudCk7CisgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBteWNhbGxiYWNr KGNvbnRlbnQpCisgICAgICAgIHsKKyAgICAgICAgICAgIHRoaXMuX2NvbnRlbnQgPSBjb250ZW50 OworICAgICAgICAgICAgY2FsbGJhY2soY29udGVudCk7CisgICAgICAgIH0KKyAgICAgICAgV2Vi SW5zcGVjdG9yLm5ldHdvcmtNYW5hZ2VyLnJlcXVlc3RDb250ZW50KHRoaXMuX3Jlc291cmNlLCBm YWxzZSwgbXljYWxsYmFjay5iaW5kKHRoaXMpKTsKKyAgICB9Cit9CiAKIFdlYkluc3BlY3Rvci5S ZXNvdXJjZURvbWFpbk1vZGVsQmluZGluZyA9IGZ1bmN0aW9uKCkKIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKaW5kZXggYTdjNjEx MDM2YjZhNDViNjE3YTgwYjQ5ODhhNzBkYzJiN2ZmMTg4Ny4uYWNmNWEyOGQ4ZjAzMjg3MmNlYjc3 MzY2YmMyZGExMTYzNTMxM2ZkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKQEAgLTYyLDcgKzYyLDcgQEAgV2ViSW5zcGVjdG9y LlJlc291cmNlVmlldy5jcmVhdGVSZXNvdXJjZVZpZXcgPSBmdW5jdGlvbihyZXNvdXJjZSkKIAog V2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5yZXNvdXJjZVZpZXdUeXBlTWF0Y2hlc1Jlc291cmNl ID0gZnVuY3Rpb24ocmVzb3VyY2UpCiB7Ci0gICAgdmFyIHJlc291cmNlVmlldyA9IHJlc291cmNl Ll9yZXNvdXJjZXNWaWV3OworICAgIHZhciByZXNvdXJjZVZpZXcgPSByZXNvdXJjZS5fcmVzb3Vy Y2VWaWV3OwogICAgIHN3aXRjaCAocmVzb3VyY2UuY2F0ZWdvcnkpIHsKICAgICBjYXNlIFdlYklu c3BlY3Rvci5yZXNvdXJjZUNhdGVnb3JpZXMuZG9jdW1lbnRzOgogICAgIGNhc2UgV2ViSW5zcGVj dG9yLnJlc291cmNlQ2F0ZWdvcmllcy5zY3JpcHRzOgpAQCAtODIsMjMgKzgyLDIzIEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZVZpZXcucmVzb3VyY2VWaWV3Rm9yUmVzb3VyY2UgPSBmdW5jdGlvbihy ZXNvdXJjZSkKIHsKICAgICBpZiAoIXJlc291cmNlKQogICAgICAgICByZXR1cm4gbnVsbDsKLSAg ICBpZiAoIXJlc291cmNlLl9yZXNvdXJjZXNWaWV3KQotICAgICAgICByZXNvdXJjZS5fcmVzb3Vy Y2VzVmlldyA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcuY3JlYXRlUmVzb3VyY2VWaWV3KHJl c291cmNlKTsKLSAgICByZXR1cm4gcmVzb3VyY2UuX3Jlc291cmNlc1ZpZXc7CisgICAgaWYgKCFy ZXNvdXJjZS5fcmVzb3VyY2VWaWV3KQorICAgICAgICByZXNvdXJjZS5fcmVzb3VyY2VWaWV3ID0g V2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5jcmVhdGVSZXNvdXJjZVZpZXcocmVzb3VyY2UpOwor ICAgIHJldHVybiByZXNvdXJjZS5fcmVzb3VyY2VWaWV3OwogfQogCiBXZWJJbnNwZWN0b3IuUmVz b3VyY2VWaWV3LnJlY3JlYXRlUmVzb3VyY2VWaWV3ID0gZnVuY3Rpb24ocmVzb3VyY2UpCiB7CiAg ICAgdmFyIG5ld1ZpZXcgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LmNyZWF0ZVJlc291cmNl VmlldyhyZXNvdXJjZSk7CiAKLSAgICB2YXIgb2xkVmlldyA9IHJlc291cmNlLl9yZXNvdXJjZXNW aWV3OworICAgIHZhciBvbGRWaWV3ID0gcmVzb3VyY2UuX3Jlc291cmNlVmlldzsKICAgICB2YXIg b2xkVmlld1BhcmVudE5vZGUgPSBvbGRWaWV3LnZpc2libGUgPyBvbGRWaWV3LmVsZW1lbnQucGFy ZW50Tm9kZSA6IG51bGw7CiAgICAgdmFyIHNjcm9sbFRvcCA9IG9sZFZpZXcuc2Nyb2xsVG9wOwog Ci0gICAgcmVzb3VyY2UuX3Jlc291cmNlc1ZpZXcuZGV0YWNoKCk7Ci0gICAgZGVsZXRlIHJlc291 cmNlLl9yZXNvdXJjZXNWaWV3OworICAgIHJlc291cmNlLl9yZXNvdXJjZVZpZXcuZGV0YWNoKCk7 CisgICAgZGVsZXRlIHJlc291cmNlLl9yZXNvdXJjZVZpZXc7CiAKLSAgICByZXNvdXJjZS5fcmVz b3VyY2VzVmlldyA9IG5ld1ZpZXc7CisgICAgcmVzb3VyY2UuX3Jlc291cmNlVmlldyA9IG5ld1Zp ZXc7CiAKICAgICBpZiAob2xkVmlld1BhcmVudE5vZGUpCiAgICAgICAgIG5ld1ZpZXcuc2hvdyhv bGRWaWV3UGFyZW50Tm9kZSk7CkBAIC0xMTIsNyArMTEyLDcgQEAgV2ViSW5zcGVjdG9yLlJlc291 cmNlVmlldy5leGlzdGluZ1Jlc291cmNlVmlld0ZvclJlc291cmNlID0gZnVuY3Rpb24ocmVzb3Vy Y2UpCiB7CiAgICAgaWYgKCFyZXNvdXJjZSkKICAgICAgICAgcmV0dXJuIG51bGw7Ci0gICAgcmV0 dXJuIHJlc291cmNlLl9yZXNvdXJjZXNWaWV3OworICAgIHJldHVybiByZXNvdXJjZS5fcmVzb3Vy Y2VWaWV3OwogfQogCiAKQEAgLTE2Niw3ICsxNjYsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VT b3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9pbmNyZW1lbnRh bFVwZGF0ZVRpbWVyOwogICAgIH0sCiAKLSAgICBfcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNh bGxiYWNrKQorICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykKICAgICB7CiAg ICAgICAgIGZ1bmN0aW9uIGNvbnRlbnRMb2FkZWQodGV4dCkKICAgICAgICAgewpAQCAtMTc4LDMg KzE3OCwzMyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7 CiB9CiAKIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lLnByb3RvdHlwZS5fX3Byb3Rv X18gPSBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlOworCitXZWJJbnNwZWN0b3Iu UmV2aXNpb25Tb3VyY2VGcmFtZSA9IGZ1bmN0aW9uKHJldmlzaW9uKQoreworICAgIFdlYkluc3Bl Y3Rvci5Tb3VyY2VGcmFtZS5jYWxsKHRoaXMsIG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVE ZWxlZ2F0ZSgpLCByZXZpc2lvbi5yZXNvdXJjZS51cmwpOworICAgIHRoaXMuX3JldmlzaW9uID0g cmV2aXNpb247Cit9CisKK1dlYkluc3BlY3Rvci5SZXZpc2lvblNvdXJjZUZyYW1lLnByb3RvdHlw ZSA9IHsKKyAgICBnZXQgcmVzb3VyY2UoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Jl dmlzaW9uLnJlc291cmNlOworICAgIH0sCisKKyAgICBpc0NvbnRlbnRFZGl0YWJsZTogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0sCisKKyAgICByZXF1ZXN0 Q29udGVudDogZnVuY3Rpb24oY2FsbGJhY2spCisgICAgeworICAgICAgICBmdW5jdGlvbiBjb250 ZW50TG9hZGVkKHRleHQpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciBtaW1lVHlwZSA9IFdl Ykluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lLkRlZmF1bHRNSU1FVHlwZUZvclJlc291cmNl VHlwZVt0aGlzLl9yZXZpc2lvbi5yZXNvdXJjZS50eXBlXSB8fCB0aGlzLl9yZXZpc2lvbi5yZXNv dXJjZS5taW1lVHlwZTsKKyAgICAgICAgICAgIGNhbGxiYWNrKG1pbWVUeXBlLCB0ZXh0KTsKKyAg ICAgICAgfQorICAgICAgICB0aGlzLl9yZXZpc2lvbi5yZXF1ZXN0Q29udGVudChjb250ZW50TG9h ZGVkLmJpbmQodGhpcykpOworICAgIH0KK30KKworV2ViSW5zcGVjdG9yLlJldmlzaW9uU291cmNl RnJhbWUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90 b3R5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZXNQYW5lbC5qcwppbmRleCBhZWE4YmU5M2RkNDkyODFiZDIyMzg0NjVkNzc1NTJhZjlmY2Y3 YjAzLi5kMDc3ZmM4M2IxYzZmZjRkYWYxY2IzNWRkZDFlY2M2MjBjZDMxOWQwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMK QEAgLTQwMywxOSArNDAzLDQwIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgX3Nob3dSZXNvdXJjZVZpZXc6IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHsK ICAgICAgICAgdmFyIHZpZXcgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnJlc291cmNlVmll d0ZvclJlc291cmNlKHJlc291cmNlKTsKKyAgICAgICAgdGhpcy5fZmV0Y2hBbmRBcHBseURpZmZN YXJrdXAodmlldywgcmVzb3VyY2UpOworICAgICAgICB0aGlzLl9pbm5lclNob3dWaWV3KHZpZXcp OworICAgIH0sCiAKLSAgICAgICAgLy8gQ29uc2lkZXIgcmVuZGVyaW5nIGRpZmYgbWFya3VwIGhl cmUuCi0gICAgICAgIGlmIChyZXNvdXJjZS5iYXNlUmV2aXNpb24gJiYgdmlldyBpbnN0YW5jZW9m IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZSkgewotICAgICAgICAgICAgZnVuY3Rpb24gY2FsbGJh Y2soYmFzZUNvbnRlbnQpCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgaWYgKGJhc2VD b250ZW50KQotICAgICAgICAgICAgICAgICAgICB0aGlzLl9hcHBseURpZmZNYXJrdXAodmlldywg YmFzZUNvbnRlbnQsIHJlc291cmNlLmNvbnRlbnQpOwotICAgICAgICAgICAgfQotICAgICAgICAg ICAgcmVzb3VyY2UuYmFzZVJldmlzaW9uLnJlcXVlc3RDb250ZW50KGNhbGxiYWNrLmJpbmQodGhp cykpOwotICAgICAgICB9CisgICAgX3Nob3dSZXZpc2lvblZpZXc6IGZ1bmN0aW9uKHJldmlzaW9u KQorICAgIHsKKyAgICAgICAgaWYgKCFyZXZpc2lvbi5fdmlldykKKyAgICAgICAgICAgIHJldmlz aW9uLl92aWV3ID0gbmV3IFdlYkluc3BlY3Rvci5SZXZpc2lvblNvdXJjZUZyYW1lKHJldmlzaW9u KTsKKyAgICAgICAgdmFyIHZpZXcgPSByZXZpc2lvbi5fdmlldzsKKyAgICAgICAgdGhpcy5fZmV0 Y2hBbmRBcHBseURpZmZNYXJrdXAodmlldywgcmV2aXNpb24ucmVzb3VyY2UsIHJldmlzaW9uKTsK ICAgICAgICAgdGhpcy5faW5uZXJTaG93Vmlldyh2aWV3KTsKICAgICB9LAogCisgICAgX2ZldGNo QW5kQXBwbHlEaWZmTWFya3VwOiBmdW5jdGlvbih2aWV3LCByZXNvdXJjZSwgcmV2aXNpb24pCisg ICAgeworICAgICAgICB2YXIgYmFzZVJldmlzaW9uID0gcmVzb3VyY2UuaGlzdG9yeVswXTsKKyAg ICAgICAgaWYgKCFiYXNlUmV2aXNpb24pCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlm ICghKHZpZXcgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUpKQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIGJhc2VSZXZpc2lvbi5yZXF1ZXN0Q29udGVudChzdGVwMS5i aW5kKHRoaXMpKTsKKworICAgICAgICBmdW5jdGlvbiBzdGVwMShiYXNlQ29udGVudCkKKyAgICAg ICAgeworICAgICAgICAgICAgKHJldmlzaW9uID8gcmV2aXNpb24gOiByZXNvdXJjZSkucmVxdWVz dENvbnRlbnQoc3RlcDIuYmluZCh0aGlzLCBiYXNlQ29udGVudCkpOworICAgICAgICB9CisKKyAg ICAgICAgZnVuY3Rpb24gc3RlcDIoYmFzZUNvbnRlbnQsIHJldmlzaW9uQ29udGVudCkKKyAgICAg ICAgeworICAgICAgICAgICAgdGhpcy5fYXBwbHlEaWZmTWFya3VwKHZpZXcsIGJhc2VDb250ZW50 LCByZXZpc2lvbkNvbnRlbnQpOworICAgICAgICB9CisgICAgfSwKKwogICAgIF9hcHBseURpZmZN YXJrdXA6IGZ1bmN0aW9uKHZpZXcsIGJhc2VDb250ZW50LCBuZXdDb250ZW50KSB7CiAgICAgICAg IHZhciBvbGRMaW5lcyA9IGJhc2VDb250ZW50LnNwbGl0KC9ccj9cbi8pOwogICAgICAgICB2YXIg bmV3TGluZXMgPSBuZXdDb250ZW50LnNwbGl0KC9ccj9cbi8pOwpAQCAtMTI1MiwxMyArMTI3Mywx OCBAQCBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZVRyZWVFbGVtZW50LnByb3RvdHlwZS5f X3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuQmFzZQogV2ViSW5zcGVjdG9yLlJlc291cmNlUmV2aXNp b25UcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHN0b3JhZ2VQYW5lbCwgcmV2aXNpb24pCiB7CiAgICAg dmFyIHRpdGxlID0gcmV2aXNpb24udGltZXN0YW1wID8gcmV2aXNpb24udGltZXN0YW1wLnRvTG9j YWxlVGltZVN0cmluZygpIDogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIob3JpZ2luYWwpIik7Ci0g ICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCBzdG9yYWdl UGFuZWwsIG51bGwsIHRpdGxlLCBbInJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtIiwgInJlc291 cmNlcy1jYXRlZ29yeS0iICsgcmV2aXNpb24uY2F0ZWdvcnkubmFtZV0pOworICAgIFdlYkluc3Bl Y3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LmNhbGwodGhpcywgc3RvcmFnZVBhbmVsLCBudWxs LCB0aXRsZSwgWyJyZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbSIsICJyZXNvdXJjZXMtY2F0ZWdv cnktIiArIHJldmlzaW9uLnJlc291cmNlLmNhdGVnb3J5Lm5hbWVdKTsKICAgICBpZiAocmV2aXNp b24udGltZXN0YW1wKQogICAgICAgICB0aGlzLnRvb2x0aXAgPSByZXZpc2lvbi50aW1lc3RhbXAu dG9Mb2NhbGVTdHJpbmcoKTsKLSAgICB0aGlzLl9yZXNvdXJjZSA9IHJldmlzaW9uOworICAgIHRo aXMuX3JldmlzaW9uID0gcmV2aXNpb247CiB9CiAKIFdlYkluc3BlY3Rvci5SZXNvdXJjZVJldmlz aW9uVHJlZUVsZW1lbnQucHJvdG90eXBlID0geworICAgIGdldCBpdGVtVVJMKCkKKyAgICB7Cisg ICAgICAgIHJldHVybiB0aGlzLl9yZXZpc2lvbi5yZXNvdXJjZS51cmw7CisgICAgfSwKKwogICAg IG9uYXR0YWNoOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuQmFzZVN0 b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2guY2FsbCh0aGlzKTsKQEAgLTEyNzAs MjAgKzEyOTYsMjIgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlUmV2aXNpb25UcmVlRWxlbWVudC5w cm90b3R5cGUgPSB7CiAgICAgb25zZWxlY3Q6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIFdl Ykluc3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdC5jYWxs KHRoaXMpOwotICAgICAgICB0aGlzLl9zdG9yYWdlUGFuZWwuX3Nob3dSZXNvdXJjZVZpZXcodGhp cy5fcmVzb3VyY2UpOworICAgICAgICB0aGlzLl9zdG9yYWdlUGFuZWwuX3Nob3dSZXZpc2lvblZp ZXcodGhpcy5fcmV2aXNpb24pOwogICAgIH0sCiAKICAgICBfb25kcmFnc3RhcnQ6IGZ1bmN0aW9u KGV2ZW50KQogICAgIHsKLSAgICAgICAgZXZlbnQuZGF0YVRyYW5zZmVyLnNldERhdGEoInRleHQv cGxhaW4iLCB0aGlzLl9yZXNvdXJjZS5jb250ZW50KTsKLSAgICAgICAgZXZlbnQuZGF0YVRyYW5z ZmVyLmVmZmVjdEFsbG93ZWQgPSAiY29weSI7Ci0gICAgICAgIHJldHVybiB0cnVlOworICAgICAg ICBpZiAodGhpcy5fcmV2aXNpb24uY29udGVudCkgeworICAgICAgICAgICAgZXZlbnQuZGF0YVRy YW5zZmVyLnNldERhdGEoInRleHQvcGxhaW4iLCB0aGlzLl9yZXZpc2lvbi5jb250ZW50KTsKKyAg ICAgICAgICAgIGV2ZW50LmRhdGFUcmFuc2Zlci5lZmZlY3RBbGxvd2VkID0gImNvcHkiOworICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KICAgICB9LAogCiAgICAgX2hhbmRsZUNv bnRleHRNZW51RXZlbnQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIGNvbnRl eHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudSgpOwotICAgICAgICBjb250ZXh0 TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmV2ZXJ0IHRvIHRoaXMgcmV2 aXNpb24iKSwgdGhpcy5fcmVzb3VyY2UucmV2ZXJ0VG9UaGlzLmJpbmQodGhpcy5fcmVzb3VyY2Up KTsKKyAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlJldmVydCB0byB0aGlzIHJldmlzaW9uIiksIHRoaXMuX3JldmlzaW9uLnJldmVydFRvVGhpcy5i aW5kKHRoaXMuX3JldmlzaW9uKSk7CiAgICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQpOwog ICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZUZyYW1lLmpzCmluZGV4IGI1ZWZjYTllNmJiMTgxMjJlMTcyYTFjMzMyZDVmMmFjNGNkNjYxOTYu LmZkYTNlMGM5NzNhZDEzMDE3MDgzY2U1ZDFhNDA5ZDBjNmIwZWFlZGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtMTE5LDEx ICsxMTksMTEgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICB7 CiAgICAgICAgIGlmICghdGhpcy5fY29udGVudFJlcXVlc3RlZCkgewogICAgICAgICAgICAgdGhp cy5fY29udGVudFJlcXVlc3RlZCA9IHRydWU7Ci0gICAgICAgICAgICB0aGlzLl9yZXF1ZXN0Q29u dGVudCh0aGlzLl9pbml0aWFsaXplVGV4dFZpZXdlci5iaW5kKHRoaXMpKTsKKyAgICAgICAgICAg IHRoaXMucmVxdWVzdENvbnRlbnQodGhpcy5faW5pdGlhbGl6ZVRleHRWaWV3ZXIuYmluZCh0aGlz KSk7CiAgICAgICAgIH0KICAgICB9LAogCi0gICAgX3JlcXVlc3RDb250ZW50OiBmdW5jdGlvbihj YWxsYmFjaykKKyAgICByZXF1ZXN0Q29udGVudDogZnVuY3Rpb24oY2FsbGJhY2spCiAgICAgewog ICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5yZXF1ZXN0Q29udGVudChjYWxsYmFjayk7CiAgICAgfSwK QEAgLTkwMyw4ICs5MDMsMTAgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9 IHsKICAgICAgICAgZnVuY3Rpb24gZGlkRWRpdENvbnRlbnQoZXJyb3IpCiAgICAgICAgIHsKICAg ICAgICAgICAgIGlmIChlcnJvcikgewotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2co ZXJyb3IuZGF0YVswXSwgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5F cnJvcik7Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dDb25zb2xlKCk7CisgICAg ICAgICAgICAgICAgaWYgKGVycm9yLmRhdGEgJiYgZXJyb3IuZGF0YVswXSkgeworICAgICAgICAg ICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nKGVycm9yLmRhdGFbMF0sIFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuRXJyb3IpOworICAgICAgICAgICAgICAgICAgICBX ZWJJbnNwZWN0b3Iuc2hvd0NvbnNvbGUoKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICAgICAgY2FsbGJhY2soZXJyb3IpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg ICAgIH0K