99997 2012-10-22 07:59:18 -0700 Web Inspector: Prepare mappings to moving uiSourceCodes creation out of them to workspace. 2012-10-22 09:57:04 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 747538 0 vsevik 2012-10-22 07:59:18 -0700 Patch to follow 747568 1 169918 vsevik 2012-10-22 08:25:26 -0700 Created attachment 169918 Patch 747600 2 169918 buildbot 2012-10-22 09:19:26 -0700 Comment on attachment 169918 Patch Attachment 169918 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14482585 New failing tests: http/tests/inspector/compiler-script-mapping.html 747645 3 vsevik 2012-10-22 09:57:04 -0700 Committed r132086: <http://trac.webkit.org/changeset/132086> 169918 2012-10-22 08:25:26 -0700 2012-10-22 09:19:26 -0700 Patch bug-99997-20121022192403.patch text/plain 17553 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyMDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmRkYmUxYTlkMDIzZDQy MjA3NmQwNTJjZTIyNGIyMjcwOGM2NTEyMy4uN2NjODZiNWExZTVjZTA5MDE0MDBmMWI1MzAwYzM4 YmVmYTlhNGE5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTEwLTIyICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFByZXBhcmUgbWFwcGluZ3MgdG8gbW92aW5nIHVpU291cmNlQ29kZXMgY3JlYXRpb24gb3V0 IG9mIHRoZW0gdG8gd29ya3NwYWNlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTk5OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBTb3VyY2UgbWFwcGluZ3MgY291bGQgbm93IHN0b3JlIGEgbGluayB0byB0 ZW1wb3JhcnkgdWlTb3VyY2VDb2RlcyBvbmx5LgorICAgICAgICBPdGhlcndpc2UgaXQgc2hvdWxk IHJldHJpZXZlIHVpU291cmNlQ29kZXMgZnJvbSB3b3Jrc3BhY2UgYnkgVVJMLgorICAgICAgICBP cmlnaW5hbCB1aVNvdXJjZUNvZGVzIGFyZSBub3cgdGVtcG9yYXJ5IGluIENvbXBpbGVyU2NyaXB0 TWFwcGluZy4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRN YXBwaW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29tcGlsZXJTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5y YXdMb2NhdGlvblRvVUlMb2NhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29tcGlsZXJT Y3JpcHRNYXBwaW5nLnByb3RvdHlwZS5sb2FkU291cmNlTWFwRm9yU2NyaXB0KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Db21waWxlclNjcmlwdE1hcHBpbmcucHJvdG90eXBlLl9yZXNldCk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrVUlTb3VyY2VDb2RlUHJvdmlkZXIu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1VJU291cmNlQ29kZVByb3ZpZGVyKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrVUlTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90 eXBlLl9wYXJzZWRTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtV SVNvdXJjZUNvZGVQcm92aWRlci5wcm90b3R5cGUuX3Jlc291cmNlQWRkZWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLk5ldHdvcmtVSVNvdXJjZUNvZGVQcm92aWRlci5wcm90b3R5cGUuX2FkZFVJ U291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1VJU291cmNlQ29kZVBy b3ZpZGVyLnByb3RvdHlwZS5fcHJvamVjdFdpbGxSZXNldCk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9TQVNTU291cmNlTWFwcGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T QVNTU291cmNlTWFwcGluZyk6CisgICAgICAgIChfYmluZFVJU291cmNlQ29kZSk6CisgICAgICAg IChfcmVzZXQpOgorCiAyMDEyLTEwLTIxICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBQYWdlIHBvcHVwOiBGaXggY3Jhc2ggYnkgZXZlbnRzIGFmdGVyIGNsb3Np bmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGls ZXJTY3JpcHRNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b21waWxlclNjcmlwdE1hcHBpbmcuanMKaW5kZXggOWEwYjEwMzVmMzVjNjc1OGNmMTFiNjhmZDE0 ZDYwMDRlZjAzMjQ5Ni4uNjkzZjFkMDRiYmVmZjY5ZGQ4NWY4ZmU2OTM0ZDVkOGFkMDI3YmRlZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNj cmlwdE1hcHBpbmcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b21waWxlclNjcmlwdE1hcHBpbmcuanMKQEAgLTM2LDEzICszNiwxNiBAQAogV2ViSW5zcGVjdG9y LkNvbXBpbGVyU2NyaXB0TWFwcGluZyA9IGZ1bmN0aW9uKHdvcmtzcGFjZSkKIHsKICAgICB0aGlz Ll93b3Jrc3BhY2UgPSB3b3Jrc3BhY2U7Ci0gICAgdGhpcy5fc291cmNlTWFwQnlVUkwgPSB7fTsK KyAgICAvKiogQHR5cGUge09iamVjdC48c3RyaW5nLCBXZWJJbnNwZWN0b3IuU291cmNlTWFwUGFy c2VyPn0gKi8KKyAgICB0aGlzLl9zb3VyY2VNYXBGb3JTb3VyY2VNYXBVUkwgPSB7fTsKKyAgICAv KiogQHR5cGUge09iamVjdC48c3RyaW5nLCBXZWJJbnNwZWN0b3IuU291cmNlTWFwUGFyc2VyPn0g Ki8KICAgICB0aGlzLl9zb3VyY2VNYXBGb3JTY3JpcHRJZCA9IHt9OwogICAgIHRoaXMuX3Njcmlw dEZvclNvdXJjZU1hcCA9IG5ldyBNYXAoKTsKLSAgICB0aGlzLl9zb3VyY2VNYXBGb3JVSVNvdXJj ZUNvZGUgPSBuZXcgTWFwKCk7Ci0gICAgdGhpcy5fdWlTb3VyY2VDb2RlQnlVUkwgPSB7fTsKKyAg ICAvKiogQHR5cGUge09iamVjdC48c3RyaW5nLCBXZWJJbnNwZWN0b3IuU291cmNlTWFwUGFyc2Vy Pn0gKi8KKyAgICB0aGlzLl9zb3VyY2VNYXBGb3JVUkwgPSB7fTsKKyAgICAvKiogQHR5cGUge09i amVjdC48c3RyaW5nLCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlPn0gKi8KICAgICB0aGlzLl9v cmlnaW5hbFVJU291cmNlQ29kZUZvclNjcmlwdElkID0ge307Ci0gICAgdGhpcy5fc2NyaXB0Rm9y T3JpZ2luYWxVSVNvdXJjZSA9IG5ldyBNYXAoKTsKKyAgICB0aGlzLl9zY3JpcHRGb3JPcmlnaW5h bFVJU291cmNlQ29kZSA9IG5ldyBNYXAoKTsKICAgICB0aGlzLl93b3Jrc3BhY2UuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuV29ya3NwYWNlLkV2ZW50cy5Qcm9qZWN0V2lsbFJlc2V0LCB0 aGlzLl9yZXNldCwgdGhpcyk7CiB9CiAKQEAgLTU4LDkgKzYxLDEyIEBAIFdlYkluc3BlY3Rvci5D b21waWxlclNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgbGluZU51bWJl ciA9IGRlYnVnZ2VyTW9kZWxMb2NhdGlvbi5saW5lTnVtYmVyOwogICAgICAgICB2YXIgY29sdW1u TnVtYmVyID0gZGVidWdnZXJNb2RlbExvY2F0aW9uLmNvbHVtbk51bWJlciB8fCAwOwogICAgICAg ICB2YXIgZW50cnkgPSBzb3VyY2VNYXAuZmluZEVudHJ5KGxpbmVOdW1iZXIsIGNvbHVtbk51bWJl cik7Ci0gICAgICAgIGlmIChlbnRyeS5sZW5ndGggPT09IDIpCi0gICAgICAgICAgICByZXR1cm4g bmV3IFdlYkluc3BlY3Rvci5VSUxvY2F0aW9uKHRoaXMuX29yaWdpbmFsVUlTb3VyY2VDb2RlRm9y U2NyaXB0SWRbZGVidWdnZXJNb2RlbExvY2F0aW9uLnNjcmlwdElkXSwgbGluZU51bWJlciwgY29s dW1uTnVtYmVyKTsKLSAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuVUlMb2NhdGlvbih0 aGlzLl91aVNvdXJjZUNvZGVCeVVSTFtlbnRyeVsyXV0sIGVudHJ5WzNdLCBlbnRyeVs0XSk7Cisg ICAgICAgIGlmIChlbnRyeS5sZW5ndGggPT09IDIpIHsKKyAgICAgICAgICAgIHZhciB0ZW1wb3Jh cnlVSVNvdXJjZUNvZGUgPSB0aGlzLl9vcmlnaW5hbFVJU291cmNlQ29kZUZvclNjcmlwdElkW2Rl YnVnZ2VyTW9kZWxMb2NhdGlvbi5zY3JpcHRJZF07CisgICAgICAgICAgICByZXR1cm4gbmV3IFdl Ykluc3BlY3Rvci5VSUxvY2F0aW9uKHRlbXBvcmFyeXxVSVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIs IGNvbHVtbk51bWJlcik7CisgICAgICAgIH0KKyAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IHRo aXMuX3dvcmtzcGFjZS51aVNvdXJjZUNvZGVGb3JVUkwoZW50cnlbMl0pOworICAgICAgICByZXR1 cm4gbmV3IFdlYkluc3BlY3Rvci5VSUxvY2F0aW9uKHVpU291cmNlQ29kZSwgZW50cnlbM10sIGVu dHJ5WzRdKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC03MSwxMCArNzcsMTAgQEAgV2ViSW5zcGVj dG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgdWlM b2NhdGlvblRvUmF3TG9jYXRpb246IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwgbGluZU51bWJlciwg Y29sdW1uTnVtYmVyKQogICAgIHsKLSAgICAgICAgdmFyIHNjcmlwdCA9IHRoaXMuX3NjcmlwdEZv ck9yaWdpbmFsVUlTb3VyY2UuZ2V0KHVpU291cmNlQ29kZSk7CisgICAgICAgIHZhciBzY3JpcHQg PSB0aGlzLl9zY3JpcHRGb3JPcmlnaW5hbFVJU291cmNlQ29kZS5nZXQodWlTb3VyY2VDb2RlKTsK ICAgICAgICAgaWYgKHNjcmlwdCkKICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuZGVi dWdnZXJNb2RlbC5jcmVhdGVSYXdMb2NhdGlvbihzY3JpcHQsIGxpbmVOdW1iZXIsIGNvbHVtbk51 bWJlcik7Ci0gICAgICAgIHZhciBzb3VyY2VNYXAgPSB0aGlzLl9zb3VyY2VNYXBGb3JVSVNvdXJj ZUNvZGUuZ2V0KHVpU291cmNlQ29kZSk7CisgICAgICAgIHZhciBzb3VyY2VNYXAgPSB0aGlzLl9z b3VyY2VNYXBGb3JVUkxbdWlTb3VyY2VDb2RlLnVybF07CiAgICAgICAgIHZhciBlbnRyeSA9IHNv dXJjZU1hcC5maW5kRW50cnlSZXZlcnNlZCh1aVNvdXJjZUNvZGUudXJsLCBsaW5lTnVtYmVyKTsK ICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmNyZWF0ZVJhd0xvY2F0 aW9uKHRoaXMuX3NjcmlwdEZvclNvdXJjZU1hcC5nZXQoc291cmNlTWFwKSwgZW50cnlbMF0sIGVu dHJ5WzFdKTsKICAgICB9LApAQCAtODQsMTAgKzkwLDEzIEBAIFdlYkluc3BlY3Rvci5Db21waWxl clNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewogICAgICAqLwogICAgIGFkZFNjcmlwdDogZnVu Y3Rpb24oc2NyaXB0KQogICAgIHsKLSAgICAgICAgdmFyIG9yaWdpbmFsVUlTb3VyY2VDb2RlID0g bmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUoc2NyaXB0LnNvdXJjZVVSTCwgc2NyaXB0LCB0 cnVlKTsKKyAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBvbmx5IGNyZWF0ZSB0ZW1wb3Jhcnkg dWlTb3VyY2VDb2RlcyBvbiBkZW1hbmQgYW5kIHNob3VsZCBzZXQgdGhpcyBhcyBhIG1hcHBpbmcg dG8gCisgICAgICAgIC8vIHJlbGV2YW50IHVpU291cmNlQ29kZXMgYWRkZWQgYnkgTmV0d29ya1VJ U291cmNlQ29kZVByb3ZpZGVyLgorICAgICAgICB2YXIgb3JpZ2luYWxVSVNvdXJjZUNvZGUgPSBu ZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZShzY3JpcHQuc291cmNlVVJMLCBzY3JpcHQsIGZh bHNlKTsKICAgICAgICAgdGhpcy5fb3JpZ2luYWxVSVNvdXJjZUNvZGVGb3JTY3JpcHRJZFtzY3Jp cHQuc2NyaXB0SWRdID0gb3JpZ2luYWxVSVNvdXJjZUNvZGU7Ci0gICAgICAgIHRoaXMuX3Njcmlw dEZvck9yaWdpbmFsVUlTb3VyY2UucHV0KG9yaWdpbmFsVUlTb3VyY2VDb2RlLCBzY3JpcHQpOwot ICAgICAgICB0aGlzLl93b3Jrc3BhY2UucHJvamVjdCgpLmFkZFVJU291cmNlQ29kZShvcmlnaW5h bFVJU291cmNlQ29kZSk7CisgICAgICAgIHRoaXMuX3NjcmlwdEZvck9yaWdpbmFsVUlTb3VyY2VD b2RlLnB1dChvcmlnaW5hbFVJU291cmNlQ29kZSwgc2NyaXB0KTsKKyAgICAgICAgb3JpZ2luYWxV SVNvdXJjZUNvZGUuc2V0U291cmNlTWFwcGluZyh0aGlzKTsKKyAgICAgICAgdGhpcy5fd29ya3Nw YWNlLnByb2plY3QoKS5hZGRUZW1wb3JhcnlVSVNvdXJjZUNvZGUob3JpZ2luYWxVSVNvdXJjZUNv ZGUpOwogCiAgICAgICAgIHZhciBzb3VyY2VNYXAgPSB0aGlzLmxvYWRTb3VyY2VNYXBGb3JTY3Jp cHQoc2NyaXB0KTsKIApAQCAtOTcsMTIgKzEwNiwxMiBAQCBXZWJJbnNwZWN0b3IuQ29tcGlsZXJT Y3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg fQogCi0gICAgICAgIHZhciB1aVNvdXJjZUNvZGVMaXN0ID0gW107CiAgICAgICAgIHZhciBzb3Vy Y2VVUkxzID0gc291cmNlTWFwLnNvdXJjZXMoKTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCBzb3VyY2VVUkxzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgc291cmNlVVJMID0g c291cmNlVVJMc1tpXTsKLSAgICAgICAgICAgIGlmICh0aGlzLl91aVNvdXJjZUNvZGVCeVVSTFtz b3VyY2VVUkxdKQorICAgICAgICAgICAgaWYgKHRoaXMuX3dvcmtzcGFjZS51aVNvdXJjZUNvZGVG b3JVUkwoc291cmNlVVJMKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAg IHRoaXMuX3NvdXJjZU1hcEZvclVSTFtzb3VyY2VVUkxdID0gc291cmNlTWFwOwogICAgICAgICAg ICAgdmFyIHNvdXJjZUNvbnRlbnQgPSBzb3VyY2VNYXAuc291cmNlQ29udGVudChzb3VyY2VVUkwp OwogICAgICAgICAgICAgdmFyIGNvbnRlbnRQcm92aWRlcjsKICAgICAgICAgICAgIGlmIChzb3Vy Y2VDb250ZW50KQpAQCAtMTEwLDE5ICsxMTksMTUgQEAgV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2Ny aXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAg ICAgY29udGVudFByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5Db21waWxlclNvdXJjZU1hcHBp bmdDb250ZW50UHJvdmlkZXIoc291cmNlVVJMKTsKICAgICAgICAgICAgIHZhciB1aVNvdXJjZUNv ZGUgPSBuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZShzb3VyY2VVUkwsIGNvbnRlbnRQcm92 aWRlciwgZmFsc2UpOworICAgICAgICAgICAgdGhpcy5fd29ya3NwYWNlLnByb2plY3QoKS5hZGRV SVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlKTsKKwogICAgICAgICAgICAgdWlTb3VyY2VDb2RlLnNl dFNvdXJjZU1hcHBpbmcodGhpcyk7CiAgICAgICAgICAgICB1aVNvdXJjZUNvZGUuaXNDb250ZW50 U2NyaXB0ID0gc2NyaXB0LmlzQ29udGVudFNjcmlwdDsKLSAgICAgICAgICAgIHRoaXMuX3VpU291 cmNlQ29kZUJ5VVJMW3NvdXJjZVVSTF0gPSB1aVNvdXJjZUNvZGU7Ci0gICAgICAgICAgICB0aGlz Ll9zb3VyY2VNYXBGb3JVSVNvdXJjZUNvZGUucHV0KHVpU291cmNlQ29kZSwgc291cmNlTWFwKTsK LSAgICAgICAgICAgIHVpU291cmNlQ29kZUxpc3QucHVzaCh1aVNvdXJjZUNvZGUpOwogICAgICAg ICB9CiAKICAgICAgICAgdGhpcy5fc291cmNlTWFwRm9yU2NyaXB0SWRbc2NyaXB0LnNjcmlwdElk XSA9IHNvdXJjZU1hcDsKICAgICAgICAgdGhpcy5fc2NyaXB0Rm9yU291cmNlTWFwLnB1dChzb3Vy Y2VNYXAsIHNjcmlwdCk7CiAgICAgICAgIHNjcmlwdC5zZXRTb3VyY2VNYXBwaW5nKHRoaXMpOwot Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdWlTb3VyY2VDb2RlTGlzdC5sZW5ndGg7ICsr aSkKLSAgICAgICAgICAgIHRoaXMuX3dvcmtzcGFjZS5wcm9qZWN0KCkuYWRkVUlTb3VyY2VDb2Rl KHVpU291cmNlQ29kZUxpc3RbaV0pOwogICAgIH0sCiAKICAgICAvKioKQEAgLTEzMiw3ICsxMzcs NyBAQCBXZWJJbnNwZWN0b3IuQ29tcGlsZXJTY3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAg ICBsb2FkU291cmNlTWFwRm9yU2NyaXB0OiBmdW5jdGlvbihzY3JpcHQpCiAgICAgewogICAgICAg ICB2YXIgc291cmNlTWFwVVJMID0gV2ViSW5zcGVjdG9yLlNvdXJjZU1hcFBhcnNlci5wcm90b3R5 cGUuX2Nhbm9uaWNhbGl6ZVVSTChzY3JpcHQuc291cmNlTWFwVVJMLCBzY3JpcHQuc291cmNlVVJM KTsKLSAgICAgICAgdmFyIHNvdXJjZU1hcCA9IHRoaXMuX3NvdXJjZU1hcEJ5VVJMW3NvdXJjZU1h cFVSTF07CisgICAgICAgIHZhciBzb3VyY2VNYXAgPSB0aGlzLl9zb3VyY2VNYXBGb3JTb3VyY2VN YXBVUkxbc291cmNlTWFwVVJMXTsKICAgICAgICAgaWYgKHNvdXJjZU1hcCkKICAgICAgICAgICAg IHJldHVybiBzb3VyY2VNYXA7CiAKQEAgLTE0NywxOSArMTUyLDE4IEBAIFdlYkluc3BlY3Rvci5D b21waWxlclNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewogICAgICAgICAgICAgY29uc29sZS5l cnJvcihlLm1lc3NhZ2UpOwogICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgICAgIH0KLSAg ICAgICAgdGhpcy5fc291cmNlTWFwQnlVUkxbc291cmNlTWFwVVJMXSA9IHNvdXJjZU1hcDsKKyAg ICAgICAgdGhpcy5fc291cmNlTWFwRm9yU291cmNlTWFwVVJMW3NvdXJjZU1hcFVSTF0gPSBzb3Vy Y2VNYXA7CiAgICAgICAgIHJldHVybiBzb3VyY2VNYXA7CiAgICAgfSwKIAogICAgIF9yZXNldDog ZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fc291cmNlTWFwQnlVUkwgPSB7fTsKKyAg ICAgICAgdGhpcy5fc291cmNlTWFwRm9yU291cmNlTWFwVVJMID0ge307CiAgICAgICAgIHRoaXMu X3NvdXJjZU1hcEZvclNjcmlwdElkID0ge307CiAgICAgICAgIHRoaXMuX3NjcmlwdEZvclNvdXJj ZU1hcCA9IG5ldyBNYXAoKTsKLSAgICAgICAgdGhpcy5fc291cmNlTWFwRm9yVUlTb3VyY2VDb2Rl ID0gbmV3IE1hcCgpOwotICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGVCeVVSTCA9IHt9OworICAg ICAgICB0aGlzLl9zb3VyY2VNYXBGb3JVUkwgPSB7fTsKICAgICAgICAgdGhpcy5fb3JpZ2luYWxV SVNvdXJjZUNvZGVGb3JTY3JpcHRJZCA9IHt9OwotICAgICAgICB0aGlzLl9zY3JpcHRGb3JPcmln aW5hbFVJU291cmNlID0gbmV3IE1hcCgpOworICAgICAgICB0aGlzLl9zY3JpcHRGb3JPcmlnaW5h bFVJU291cmNlQ29kZSA9IG5ldyBNYXAoKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1VJU291cmNlQ29kZVByb3ZpZGVy LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrVUlTb3VyY2VD b2RlUHJvdmlkZXIuanMKaW5kZXggYzMzMDBhYTBmNjU2YTM0OTc3ZmVmNmI3NzVkN2FiNDBmMjRm ZjA4OS4uOTA3NGZmYmY4YjM5OTFiMTk1MGI3NzVhZmQ4M2QzNGE3NzEyNDk3YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrVUlTb3VyY2VDb2Rl UHJvdmlkZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrVUlTb3VyY2VDb2RlUHJvdmlkZXIuanMKQEAgLTQwLDcgKzQwLDcgQEAgV2ViSW5zcGVjdG9y Lk5ldHdvcmtVSVNvdXJjZUNvZGVQcm92aWRlciA9IGZ1bmN0aW9uKHdvcmtzcGFjZSkKICAgICB0 aGlzLl93b3Jrc3BhY2UuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuV29ya3NwYWNlLkV2 ZW50cy5Qcm9qZWN0RGlkUmVzZXQsIHRoaXMuX3Byb2plY3REaWRSZXNldCwgdGhpcyk7CiAgICAg V2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu RGVidWdnZXJNb2RlbC5FdmVudHMuUGFyc2VkU2NyaXB0U291cmNlLCB0aGlzLl9wYXJzZWRTY3Jp cHRTb3VyY2UsIHRoaXMpOwogCi0gICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9yUmVzb3VyY2UgPSB7 fTsKKyAgICB0aGlzLl9wcm9jZXNzZWRVUkxzID0ge307CiAgICAgdGhpcy5fbGFzdER5bmFtaWNB bm9ueW1vdXNTY3JpcHRJbmRleEZvclVSTCA9IHt9OwogfQogCkBAIC04NywxNyArODcsMTMgQEAg V2ViSW5zcGVjdG9yLk5ldHdvcmtVSVNvdXJjZUNvZGVQcm92aWRlci5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICBpZiAoIXBhcnNlZFVSTC5ob3N0KQogICAgICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgfQotICAgICAgICBpZiAodGhpcy5fdWlTb3VyY2VDb2RlRm9yUmVzb3VyY2Vbc2Ny aXB0LnNvdXJjZVVSTF0gJiYgIWlzRHluYW1pY0Fub255bW91c1NjcmlwdCkKLSAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgdmFyIHVybCA9IHNjcmlwdC5zb3VyY2VVUkw7CiAgICAgICAgIGlm IChpc0R5bmFtaWNBbm9ueW1vdXNTY3JpcHQpIHsKICAgICAgICAgICAgIHZhciBkeW5hbWljQW5v bnltb3VzU2NyaXB0SW5kZXggPSAodGhpcy5fbGFzdER5bmFtaWNBbm9ueW1vdXNTY3JpcHRJbmRl eEZvclVSTFt1cmxdIHx8IDApICsgMTsKICAgICAgICAgICAgIHRoaXMuX2xhc3REeW5hbWljQW5v bnltb3VzU2NyaXB0SW5kZXhGb3JVUkxbdXJsXSA9IGR5bmFtaWNBbm9ueW1vdXNTY3JpcHRJbmRl eDsKICAgICAgICAgICAgIHVybCArPSAiICgiICsgZHluYW1pY0Fub255bW91c1NjcmlwdEluZGV4 ICsgIikiOwogICAgICAgICB9Ci0gICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZSh1cmwsIHNjcmlwdCwgdHJ1ZSk7Ci0gICAgICAgIHRoaXMuX3Vp U291cmNlQ29kZUZvclJlc291cmNlW3NjcmlwdC5zb3VyY2VVUkxdID0gdWlTb3VyY2VDb2RlOwot ICAgICAgICB0aGlzLl93b3Jrc3BhY2UucHJvamVjdCgpLmFkZFVJU291cmNlQ29kZSh1aVNvdXJj ZUNvZGUpOworICAgICAgICB0aGlzLl9hZGRVSVNvdXJjZUNvZGUodXJsLCBzY3JpcHQpOwogICAg IH0sCiAKICAgICAvKioKQEAgLTEwNiwyOSArMTAyLDI4IEBAIFdlYkluc3BlY3Rvci5OZXR3b3Jr VUlTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBlID0gewogICAgIF9yZXNvdXJjZUFkZGVkOiBm dW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHZhciByZXNvdXJjZSA9IC8qKiBAdHlwZSB7 V2ViSW5zcGVjdG9yLlJlc291cmNlfSAqLyBldmVudC5kYXRhOwotICAgICAgICBpZiAodGhpcy5f dWlTb3VyY2VDb2RlRm9yUmVzb3VyY2VbcmVzb3VyY2UudXJsXSkKKyAgICAgICAgdGhpcy5fYWRk VUlTb3VyY2VDb2RlKHJlc291cmNlLnVybCwgcmVzb3VyY2UpOworICAgIH0sCisKKyAgICAvKioK KyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db250ZW50UHJvdmlkZXJ9IGNvbnRlbnRQcm92 aWRlcgorICAgICAqLworICAgIF9hZGRVSVNvdXJjZUNvZGU6IGZ1bmN0aW9uKHVybCwgY29udGVu dFByb3ZpZGVyKQorICAgIHsKKyAgICAgICAgdmFyIHR5cGUgPSBjb250ZW50UHJvdmlkZXIuY29u dGVudFR5cGUoKTsKKyAgICAgICAgaWYgKHR5cGUgIT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5 cGVzLlN0eWxlc2hlZXQgJiYgdHlwZSAhPT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuRG9j dW1lbnQgJiYgdHlwZSAhPT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuU2NyaXB0KQogICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlOwotICAgICAgICBzd2l0 Y2ggKHJlc291cmNlLnR5cGUpIHsKLSAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IucmVzb3VyY2VU eXBlcy5TdHlsZXNoZWV0OgotICAgICAgICAgICAgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGUocmVzb3VyY2UudXJsLCByZXNvdXJjZSwgdHJ1ZSk7Ci0gICAgICAg ICAgICBicmVhazsKLSAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5Eb2N1 bWVudDoKLSAgICAgICAgICAgIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlKHJlc291cmNlLnVybCwgcmVzb3VyY2UsIGZhbHNlKTsKLSAgICAgICAgICAgIGJyZWFr OwotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLlNjcmlwdDoKLSAgICAg ICAgICAgIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlKHJlc291 cmNlLnVybCwgcmVzb3VyY2UsIHRydWUpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0K LSAgICAgICAgaWYgKHVpU291cmNlQ29kZSkgewotICAgICAgICAgICAgdGhpcy5fdWlTb3VyY2VD b2RlRm9yUmVzb3VyY2VbcmVzb3VyY2UudXJsXSA9IHVpU291cmNlQ29kZTsKLSAgICAgICAgICAg IHRoaXMuX3dvcmtzcGFjZS5wcm9qZWN0KCkuYWRkVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSk7 Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKHRoaXMuX3Byb2Nlc3NlZFVSTHNbdXJsXSkKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fcHJvY2Vzc2VkVVJMc1t1cmxdID0gdHJ1ZTsK KyAgICAgICAgdmFyIGlzRWRpdGFibGUgPSB0eXBlICE9PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VU eXBlcy5Eb2N1bWVudDsKKyAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlKHVybCwgY29udGVudFByb3ZpZGVyLCBpc0VkaXRhYmxlKTsKKyAgICAg ICAgdGhpcy5fd29ya3NwYWNlLnByb2plY3QoKS5hZGRVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2Rl KTsKICAgICB9LAogCiAgICAgX3Byb2plY3RXaWxsUmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0g ICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUZvclJlc291cmNlID0ge307CisgICAgICAgIHRoaXMu X3Byb2Nlc3NlZFVSTHMgPSB7fTsKICAgICAgICAgdGhpcy5fbGFzdER5bmFtaWNBbm9ueW1vdXNT Y3JpcHRJbmRleEZvclVSTCA9IHt9OwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU0FTU1NvdXJjZU1hcHBpbmcuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NBU1NTb3VyY2VNYXBwaW5nLmpzCmluZGV4IGExMTRk ZjkwMWNhYzJiYzFhZTYyNjQ0OGFhMjRlMjQyMGNkMDcwMjUuLjg1YjUyMWRjZWNhZDQ2ZGUzNDk5 YjYxODBjMWZjOTAzMTFmOTE4ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU0FTU1NvdXJjZU1hcHBpbmcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TQVNTU291cmNlTWFwcGluZy5qcwpAQCAtMzYsNyArMzYsNiBAQAog V2ViSW5zcGVjdG9yLlNBU1NTb3VyY2VNYXBwaW5nID0gZnVuY3Rpb24od29ya3NwYWNlKQogewog ICAgIHRoaXMuX3dvcmtzcGFjZSA9IHdvcmtzcGFjZTsKLSAgICB0aGlzLl91aVNvdXJjZUNvZGVG b3JVUkwgPSB7fTsKICAgICB0aGlzLl91aUxvY2F0aW9ucyA9IHt9OwogICAgIFdlYkluc3BlY3Rv ci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJj ZVRyZWVNb2RlbC5FdmVudFR5cGVzLlJlc291cmNlQWRkZWQsIHRoaXMuX3Jlc291cmNlQWRkZWQs IHRoaXMpOwogICAgIHRoaXMuX3dvcmtzcGFjZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5Xb3Jrc3BhY2UuRXZlbnRzLlByb2plY3RXaWxsUmVzZXQsIHRoaXMuX3Jlc2V0LCB0aGlzKTsK QEAgLTExMiwxMiArMTExLDExIEBAIFdlYkluc3BlY3Rvci5TQVNTU291cmNlTWFwcGluZy5wcm90 b3R5cGUgPSB7CiAgICAgICovCiAgICAgX2JpbmRVSVNvdXJjZUNvZGU6IGZ1bmN0aW9uKHVybCwg bGluZSwgcmF3VVJMLCByYXdMaW5lKQogICAgIHsKLSAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9 IHRoaXMuX3VpU291cmNlQ29kZUZvclVSTFt1cmxdOworICAgICAgICB2YXIgdWlTb3VyY2VDb2Rl ID0gdGhpcy5fd29ya3NwYWNlLnVpU291cmNlQ29kZUZvclVSTCh1cmwpOwogICAgICAgICBpZiAo IXVpU291cmNlQ29kZSkgewogICAgICAgICAgICAgdmFyIGNvbnRlbnQgPSBJbnNwZWN0b3JGcm9u dGVuZEhvc3QubG9hZFJlc291cmNlU3luY2hyb25vdXNseSh1cmwpOwogICAgICAgICAgICAgdmFy IGNvbnRlbnRQcm92aWRlciA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdGljQ29udGVudFByb3ZpZGVy KFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLlN0eWxlc2hlZXQsIGNvbnRlbnQsICJ0ZXh0L3gt c2NzcyIpOwogICAgICAgICAgICAgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGUodXJsLCBjb250ZW50UHJvdmlkZXIsIHRydWUpOwotICAgICAgICAgICAgdGhpcy5f dWlTb3VyY2VDb2RlRm9yVVJMW3VybF0gPSB1aVNvdXJjZUNvZGU7CiAgICAgICAgICAgICB0aGlz Ll93b3Jrc3BhY2UucHJvamVjdCgpLmFkZFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUpOwogICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVsLnNldFNvdXJjZU1hcHBpbmcocmF3VVJMLCB0 aGlzKTsKICAgICAgICAgfQpAQCAtMTU0LDcgKzE1Miw2IEBAIFdlYkluc3BlY3Rvci5TQVNTU291 cmNlTWFwcGluZy5wcm90b3R5cGUgPSB7CiAKICAgICBfcmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7 Ci0gICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUZvclVSTCA9IHt9OwogICAgICAgICB0aGlzLl91 aUxvY2F0aW9ucyA9IHt9OwogICAgICAgICB0aGlzLl9wb3B1bGF0ZSgpOwogICAgIH0KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCBhYTQ4Yzg3MzM4MmIyZjVlNGZhM2Q3ZDRmYTQzZWYzN2RkMjIxZWJmLi5hMGRjYjNmMWI4YzIw NzQ5ZmM1YThlMGZlZWIzNTQzYTk5NzI4OTk3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTIt MTAtMjIgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg V2ViIEluc3BlY3RvcjogUHJlcGFyZSBtYXBwaW5ncyB0byBtb3ZpbmcgdWlTb3VyY2VDb2RlcyBj cmVhdGlvbiBvdXQgb2YgdGhlbSB0byB3b3Jrc3BhY2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTk5NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29tcGlsZXIt c2NyaXB0LW1hcHBpbmcuaHRtbDoKKwogMjAxMi0xMC0yMSAgRGlyayBQcmFua2UgIDxkcHJhbmtl QGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCBzdXBwcmVzc2luZyBmYWlsdXJl IHVudGlsIEkgY2FuIGZpZ3VyZSBvdXQgd2hhdCdzIGdvaW5nIG9uLgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29tcGlsZXItc2NyaXB0LW1hcHBpbmcuaHRt bCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2NvbXBpbGVyLXNjcmlwdC1tYXBw aW5nLmh0bWwKaW5kZXggYThlYzI3ZmFiM2QyYmI5YjczNTVkMWU5MTVkM2ViYjE1YWM2NTkwNi4u MmEyZjhlNzI3M2ZmMTdjNjBkY2Y1ZjIzNDFiZTJhNzUwY2NmMGJmZiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29tcGlsZXItc2NyaXB0LW1hcHBpbmcuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9jb21waWxlci1zY3JpcHQt bWFwcGluZy5odG1sCkBAIC0xNDcsNiArMTQ3LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAg ICAgICAgICAgc2NyaXB0LnNvdXJjZU1hcFVSTCA9ICJodHRwOi8vbG9jYWxob3N0OjgwMDAvaW5z cGVjdG9yL3Jlc291cmNlcy9zb3VyY2UtbWFwLmpzb24iOwogICAgICAgICAgICAgICAgIHNjcmlw dC5zZXRTb3VyY2VNYXBwaW5nKG1hcHBpbmcpOwogICAgICAgICAgICAgICAgIG1hcHBpbmcuYWRk U2NyaXB0KHNjcmlwdCk7CisgICAgICAgICAgICAgICAgYWZ0ZXJTY3JpcHRBZGRlZCgpOwogICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICBmdW5jdGlvbiBvcmlnaW5hbFVJU291cmNlQ29kZUFk ZGVkKHVpU291cmNlQ29kZSkKQEAgLTE2NSwxMSArMTY2LDEzIEBAIGZ1bmN0aW9uIHRlc3QoKQog ICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkTW9ja1VJU291cmNlQ29kZVRvV29ya3Nw YWNlKCJjb21waWxlZC5qcyIsIFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLlNjcmlwdCwgIiIp OwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBmdW5jdGlvbiBvcmlnaW5hbFJlc291cmNl VUlTb3VyY2VDb2RlQWRkZWQodWlTb3VyY2VDb2RlKQorICAgICAgICAgICAgZnVuY3Rpb24gb3Jp Z2luYWxSZXNvdXJjZVVJU291cmNlQ29kZUFkZGVkKHVpU291cmNlQ29kZSkgeyB9CisKKyAgICAg ICAgICAgIGZ1bmN0aW9uIGFmdGVyU2NyaXB0QWRkZWQodWlTb3VyY2VDb2RlKQogICAgICAgICAg ICAgewotICAgICAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUxID0gbWFwcGluZy5fdWlTb3Vy Y2VDb2RlQnlVUkxbImh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9pbnNwZWN0b3IvcmVzb3VyY2VzL3Nv dXJjZTEuanMiXTsKLSAgICAgICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlMiA9IG1hcHBpbmcu X3VpU291cmNlQ29kZUJ5VVJMWyJodHRwOi8vbG9jYWxob3N0OjgwMDAvaW5zcGVjdG9yL3Jlc291 cmNlcy9zb3VyY2UyLmpzIl07Ci0gICAgICAgICAgICAgICAgdmFyIG9yaWdpbmFsVUlTb3VyY2VD b2RlID0gbWFwcGluZy5fb3JpZ2luYWxVSVNvdXJjZUNvZGVGb3JTY3JpcHRJZFtzY3JpcHQuc2Ny aXB0SWRdOworICAgICAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUxID0gSW5zcGVjdG9yVGVz dC50ZXN0V29ya3NwYWNlLnVpU291cmNlQ29kZUZvclVSTCgiaHR0cDovL2xvY2FsaG9zdDo4MDAw L2luc3BlY3Rvci9yZXNvdXJjZXMvc291cmNlMS5qcyIpOworICAgICAgICAgICAgICAgIHZhciB1 aVNvdXJjZUNvZGUyID0gSW5zcGVjdG9yVGVzdC50ZXN0V29ya3NwYWNlLnVpU291cmNlQ29kZUZv clVSTCgiaHR0cDovL2xvY2FsaG9zdDo4MDAwL2luc3BlY3Rvci9yZXNvdXJjZXMvc291cmNlMi5q cyIpOworICAgICAgICAgICAgICAgIHZhciBvcmlnaW5hbFVJU291cmNlQ29kZSA9IEluc3BlY3Rv clRlc3QudGVzdFdvcmtzcGFjZS51aVNvdXJjZUNvZGVGb3JVUkwobWFwcGluZy5fb3JpZ2luYWxV UkxGb3JTY3JpcHRJZFtzY3JpcHQuc2NyaXB0SWRdKTsKIAogICAgICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuY2hlY2tVSUxvY2F0aW9uKHVpU291cmNlQ29kZTEsIDQsIDQsIHNjcmlwdC5yYXdM b2NhdGlvblRvVUlMb2NhdGlvbigwLCA4MSkpOwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRl c3QuY2hlY2tVSUxvY2F0aW9uKHVpU291cmNlQ29kZTEsIDUsIDQsIHNjcmlwdC5yYXdMb2NhdGlv blRvVUlMb2NhdGlvbigwLCA5MykpOwpAQCAtMjExLDcgKzIxNCw3IEBAIGZ1bmN0aW9uIHRlc3Qo KQogICAgICAgICAgICAgc2NyaXB0LnNvdXJjZU1hcFVSTCA9ICJkYXRhOmFwcGxpY2F0aW9uL2pz b247YmFzZTY0LCIgKyBidG9hKEpTT04uc3RyaW5naWZ5KHNvdXJjZU1hcCkpOwogICAgICAgICAg ICAgbWFwcGluZy5hZGRTY3JpcHQoc2NyaXB0KTsKIAotICAgICAgICAgICAgdmFyIHVpU291cmNl Q29kZSA9IG1hcHBpbmcuX3VpU291cmNlQ29kZUJ5VVJMWyJzb3VyY2UuanMiXTsKKyAgICAgICAg ICAgIHZhciB1aVNvdXJjZUNvZGUgPSB3b3Jrc3BhY2UudWlTb3VyY2VDb2RlRm9yVVJMKCJzb3Vy Y2UuanMiKTsKIAogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jaGVja1VJTG9jYXRpb24odWlT b3VyY2VDb2RlLCAyLCA0LCBtYXBwaW5nLnJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uKFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlck1vZGVsLmNyZWF0ZVJhd0xvY2F0aW9uKHNjcmlwdCwgMCwgMTgpKSk7CiAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNoZWNrUmF3TG9jYXRpb24oc2NyaXB0LCAwLCAxOCwg bWFwcGluZy51aUxvY2F0aW9uVG9SYXdMb2NhdGlvbih1aVNvdXJjZUNvZGUsIDIsIDQpKTsK