94209 2012-08-16 03:06:33 -0700 Web Inspector: Breakpoints are not correctly restored on reload. 2012-08-16 04:42:34 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 696961 0 vsevik 2012-08-16 03:06:33 -0700 This is caused by race condition between restoreBreakpoints call intiated by setTimeout in UISourceCode constructor and removing this UISourceCode from mapping when corresponding resource has finished loading. Patch to follow. 696975 1 158766 vsevik 2012-08-16 03:27:06 -0700 Created attachment 158766 Patch 696997 2 vsevik 2012-08-16 04:42:34 -0700 Committed r125767: <http://trac.webkit.org/changeset/125767> 158766 2012-08-16 03:27:06 -0700 2012-08-16 03:36:39 -0700 Patch bug-94209-20120816142631.patch text/plain 12037 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGFkNzc1ZjBhZjU1MzFh YjdiY2E4YjQ0OGVlMjhkMDhmYWIzYmI1NS4uY2I3NjgxYTY4YmI4MmMxM2FlODJlMzg2MWRjMGYz ZTBjNjc5YWQ5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA4LTE2ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEJyZWFrcG9pbnRzIGFyZSBub3QgY29ycmVjdGx5IHJlc3RvcmVkIG9uIHJlbG9hZC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0MjA5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnJlYWtwb2ludE1h bmFnZXIgbm93IHJlc2V0cyB1aUxvY2F0aW9ucyBvbiB3b3Jrc3BhY2UgcmVzZXQgKHdhcyBkb2lu ZyBpdCBvbiBHbG9iYWxPYmplY3RDbGVhcmVkKS4KKyAgICAgICAgQnJlYWtwb2ludCBtYW5hZ2Vy IG5vdyBjYWxscyByZXN0b3JlQnJlYWtwb2ludHMgYXV0b21hdGljYWxseSB3aGVuIHVpU291cmNl Q29kZSBpcyBhZGRlZCB0byB3b3Jrc3BhY2UuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9p bnRNYW5hZ2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90 b3R5cGUuX3VpU291cmNlQ29kZUFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3Bv aW50TWFuYWdlci5wcm90b3R5cGUuX3dvcmtzcGFjZVJlc2V0KToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgor CiAyMDEyLTA4LTE1ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbQ2hyb21pdW1dIFJlZmFjdG9yaW5nOiBJbnRyb2R1Y2UgYSBuZXcgZnVuY3Rpb24gZm9yIHNv bWUgcGFydCBvZiBQb3B1cENvbnRhaW5lcjo6bGF5b3V0QW5kQ2FsY3VsYXRlV2lkZ2V0UmVjdCgp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9p bnRNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3Bv aW50TWFuYWdlci5qcwppbmRleCA0MmZmMzE4ZGIxZThiMmNiMTg3NmNiYWZmNDJkNTI3ZWI0OWY0 OWU3Li44OGI2MzU3M2U3NGQ5NmIzY2Y4NmJmNTg5NTc5M2QzMmMyMjBhZDk4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFn ZXIuanMKQEAgLTMzLDExICszMywxMyBAQAogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5PYmpl Y3R9CiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5TZXR0aW5nfSBicmVha3BvaW50U3RvcmFnZQog ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbH0gZGVidWdnZXJNb2RlbAorICog QHBhcmFtIHtXZWJJbnNwZWN0b3IuV29ya3NwYWNlfSB3b3Jrc3BhY2UKICAqLwotV2ViSW5zcGVj dG9yLkJyZWFrcG9pbnRNYW5hZ2VyID0gZnVuY3Rpb24oYnJlYWtwb2ludFN0b3JhZ2UsIGRlYnVn Z2VyTW9kZWwpCitXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIgPSBmdW5jdGlvbihicmVh a3BvaW50U3RvcmFnZSwgZGVidWdnZXJNb2RlbCwgd29ya3NwYWNlKQogewogICAgIHRoaXMuX3N0 b3JhZ2UgPSBuZXcgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLlN0b3JhZ2UodGhpcywg YnJlYWtwb2ludFN0b3JhZ2UpOwogICAgIHRoaXMuX2RlYnVnZ2VyTW9kZWwgPSBkZWJ1Z2dlck1v ZGVsOworICAgIHRoaXMuX3dvcmtzcGFjZSA9IHdvcmtzcGFjZTsKIAogICAgIHRoaXMuX2JyZWFr cG9pbnRzID0gW107CiAgICAgdGhpcy5fYnJlYWtwb2ludEZvckRlYnVnZ2VySWQgPSB7fTsKQEAg LTQ1LDcgKzQ3LDggQEAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyID0gZnVuY3Rpb24o YnJlYWtwb2ludFN0b3JhZ2UsIGRlYnVnZ2VyTW9kZWwpCiAgICAgdGhpcy5fc291cmNlRmlsZXNX aXRoUmVzdG9yZWRCcmVha3BvaW50cyA9IHt9OwogCiAgICAgdGhpcy5fZGVidWdnZXJNb2RlbC5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5CcmVha3Bv aW50UmVzb2x2ZWQsIHRoaXMuX2JyZWFrcG9pbnRSZXNvbHZlZCwgdGhpcyk7Ci0gICAgdGhpcy5f ZGVidWdnZXJNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVs LkV2ZW50cy5HbG9iYWxPYmplY3RDbGVhcmVkLCB0aGlzLl9kZWJ1Z2dlclJlc2V0LCB0aGlzKTsK KyAgICB0aGlzLl93b3Jrc3BhY2UuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuV29ya3Nw YWNlLkV2ZW50cy5Xb3Jrc3BhY2VSZXNldCwgdGhpcy5fd29ya3NwYWNlUmVzZXQsIHRoaXMpOwor ICAgIHRoaXMuX3dvcmtzcGFjZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJj ZUNvZGVQcm92aWRlci5FdmVudHMuVUlTb3VyY2VDb2RlQWRkZWQsIHRoaXMuX3VpU291cmNlQ29k ZUFkZGVkLCB0aGlzKTsKIH0KIAogV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLkV2ZW50 cyA9IHsKQEAgLTc2LDYgKzc5LDE2IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5w cm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLkV2ZW50fSBldmVudAorICAgICAqLworICAgIF91aVNvdXJjZUNvZGVBZGRlZDogZnVuY3Rp b24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gLyoqIEB0eXBlIHtX ZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSAqLyBldmVudC5kYXRhOworICAgICAgICBpZiAodWlT b3VyY2VDb2RlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UpCisgICAg ICAgICAgICB0aGlzLnJlc3RvcmVCcmVha3BvaW50cyh1aVNvdXJjZUNvZGUpOworICAgIH0sCisK KyAgICAvKioKICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291 cmNlQ29kZQogICAgICAqIEBwYXJhbSB7bnVtYmVyfSBsaW5lTnVtYmVyCiAgICAgICogQHBhcmFt IHtzdHJpbmd9IGNvbmRpdGlvbgpAQCAtMTcwLDcgKzE4Myw3IEBAIFdlYkluc3BlY3Rvci5CcmVh a3BvaW50TWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3NvdXJjZUZpbGVzV2l0 aFJlc3RvcmVkQnJlYWtwb2ludHMgPSB7fTsKICAgICB9LAogCi0gICAgX2RlYnVnZ2VyUmVzZXQ6 IGZ1bmN0aW9uKCkKKyAgICBfd29ya3NwYWNlUmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAg ICAgIHZhciBicmVha3BvaW50cyA9IHRoaXMuX2JyZWFrcG9pbnRzLnNsaWNlKCk7CiAgICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgYnJlYWtwb2ludHMubGVuZ3RoOyArK2kpIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKaW5kZXgg ZWIwOGM4ZDY1MDBmYjdkZTFlZjNlYTg3MDQxNjJlZDUyMzI0NWE3Yi4uMTdhYWFhMGIxOTEyN2Jl YjgzZDY1M2NjMGUwZmRjZTM0NGJkN2U5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKQEAgLTY1LDkgKzY1LDYgQEAgV2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZSA9IGZ1bmN0aW9uKHVybCwgcmVzb3VyY2UsIGNvbnRlbnRQcm92 aWRlciwgc291cmNlTWFwcGkKICAgICB0aGlzLmhpc3RvcnkgPSBbXTsKICAgICB0aGlzLl9yZXN0 b3JlUmV2aXNpb25IaXN0b3J5KCk7CiAgICAgdGhpcy5fZm9ybWF0dGVyTWFwcGluZyA9IG5ldyBX ZWJJbnNwZWN0b3IuSWRlbnRpdHlGb3JtYXR0ZXJTb3VyY2VNYXBwaW5nKCk7Ci0KLSAgICAvLyBG SVhNRTogcG9zdHBvbmUgZm9ybWF0dGVkQ2hhbmdlZCBjYWxsIHRvIGFmdGVyIHRoZSBtYXBwaW5n IGhhcyBiZWVuIGVzdGFibGlzaGVkLgotICAgIHNldFRpbWVvdXQodGhpcy5mb3JtYXR0ZWRDaGFu Z2VkLmJpbmQodGhpcyksIDApOwogfQogCiBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50 cyA9IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMKaW5kZXggYTM5MjQ2YmI4NTA5MTA4ZjUxYzZhMTc1YjUyOTE2NDZiMzliNjZlNS4uMjFjZmMw MjI1ZWY1ZDU3YjEwMDcyZDYxMzkzYmM0N2MzOGM2N2Q3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTQ1Niw3ICs0NTYsNiBAQCBX ZWJJbnNwZWN0b3IuX2RvTG9hZGVkRG9uZVdpdGhDYXBhYmlsaXRpZXMgPSBmdW5jdGlvbigpCiAg ICAgdGhpcy5jb25zb2xlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnNvbGVNb2Rl bC5FdmVudHMuUmVwZWF0Q291bnRVcGRhdGVkLCB0aGlzLl91cGRhdGVFcnJvckFuZFdhcm5pbmdD b3VudHMsIHRoaXMpOwogCiAgICAgdGhpcy5kZWJ1Z2dlck1vZGVsID0gbmV3IFdlYkluc3BlY3Rv ci5EZWJ1Z2dlck1vZGVsKCk7Ci0gICAgdGhpcy5icmVha3BvaW50TWFuYWdlciA9IG5ldyBXZWJJ bnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIoV2ViSW5zcGVjdG9yLnNldHRpbmdzLmJyZWFrcG9p bnRzLCB0aGlzLmRlYnVnZ2VyTW9kZWwpOwogCiAgICAgV2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRp b25zLnJlcXVlc3RDU1NOYW1lQ29tcGxldGlvbnMoKTsKIApAQCAtNDk1LDYgKzQ5NCw3IEBAIFdl Ykluc3BlY3Rvci5fZG9Mb2FkZWREb25lV2l0aENhcGFiaWxpdGllcyA9IGZ1bmN0aW9uKCkKICAg ICB0aGlzLm9wZW5BbmNob3JMb2NhdGlvblJlZ2lzdHJ5LnJlZ2lzdGVySGFuZGxlcihhdXRvc2Vs ZWN0UGFuZWwsIGZ1bmN0aW9uKCkgeyByZXR1cm4gZmFsc2U7IH0pOwogCiAgICAgdGhpcy53b3Jr c3BhY2UgPSBuZXcgV2ViSW5zcGVjdG9yLldvcmtzcGFjZSgpOworICAgIHRoaXMuYnJlYWtwb2lu dE1hbmFnZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyKFdlYkluc3BlY3Rv ci5zZXR0aW5ncy5icmVha3BvaW50cywgdGhpcy5kZWJ1Z2dlck1vZGVsLCB0aGlzLndvcmtzcGFj ZSk7CiAKICAgICB0aGlzLl9jcmVhdGVQYW5lbHMoKTsKICAgICB0aGlzLl9jcmVhdGVHbG9iYWxT dGF0dXNCYXJJdGVtcygpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDcwNWEzOWU0Zjk1NTY4N2Q5YzYxNWI4ZDEzZDBmMjkx NzVkOGI4NGIuLjY5MjU0M2QzZjljMTJkNzRhZTY0NWM2NDBiYmJhZTc2NjFhM2Q1YjUgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNSBAQAorMjAxMi0wOC0xNiAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNo cm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBCcmVha3BvaW50cyBhcmUgbm90 IGNvcnJlY3RseSByZXN0b3JlZCBvbiByZWxvYWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDIwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIHJlc3RvcmVCcmVha3BvaW50cyBpcyBub3QgY2FsbGVkIGlu c2lkZSB0aGUgdGVzdCBhbnltb3JlIHRvIHRlc3QgdGhhdCBpdCBpcyBjYWxsZWQgYXV0b21hdGlj YWxseS4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9icmVha3BvaW50LW1hbmFnZXIt ZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9icmVha3BvaW50LW1h bmFnZXIuaHRtbDoKKwogMjAxMi0wOC0xNSAgWW9zaGlmdW1pIElub3VlICA8eW9zaW5AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFtUZXN0c10gRGlzYWJsZSBmYXN0L2Zvcm1zL3RpbWUtbXVsdGlw bGUtZmllbGRzIHRlc3RzIGZvciBwb3J0IHdoaWNoIGRvbid0IGVuYWJsZSBtdWx0aXBsZSBmaWVs ZHMgdGltZSBpbnB1dCBVSSBmZWF0dXJlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXIvYnJlYWtwb2ludC1tYW5hZ2VyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9kZWJ1Z2dlci9icmVha3BvaW50LW1hbmFnZXItZXhwZWN0ZWQudHh0CmluZGV4 IDU4MGIzYjA0NjM3YTkwYmQ2NmIwODMzNDYwYjNkYTgxZmM4MzYxM2QuLmFlZjE2OGE3ZTRiMTBm NTc2Yjk2NzJlMmI3MjQ4MjZmZjNlMTFmNWUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9icmVha3BvaW50LW1hbmFnZXItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9icmVha3BvaW50LW1hbmFnZXItZXhwZWN0ZWQudHh0 CkBAIC0xODksNiArMTg5LDcgQEAgUnVubmluZzogdGVzdE5hdmlnYXRpb24KIAogICBOYXZpZ2F0 aW5nIHRvIEIuCiAgIFJlc2V0dGluZyBkZWJ1Z2dlci4KKyAgUmVzZXR0aW5nIHdvcmtzcGFjZS4K ICAgICBicmVha3BvaW50UmVtb3ZlZChhLmpzLCAxMCkKICAgICBMb2NhdGlvbiBkaXNwb3NlZDog YS5qczoxMAogICAgIGJyZWFrcG9pbnRSZW1vdmVkKGEuanMsIDIwKQpAQCAtMTk5LDYgKzIwMCw3 IEBAIFJ1bm5pbmc6IHRlc3ROYXZpZ2F0aW9uCiAKICAgTmF2aWdhdGluZyBiYWNrIHRvIEEuCiAg IFJlc2V0dGluZyBkZWJ1Z2dlci4KKyAgUmVzZXR0aW5nIHdvcmtzcGFjZS4KICAgICBicmVha3Bv aW50UmVtb3ZlZChiLmpzLCAzKQogICAgIExvY2F0aW9uIGRpc3Bvc2VkOiBiLmpzOjMKICAgUmVz b2x2aW5nIHByb3Zpc2lvbmFsIGJyZWFrcG9pbnQuCkBAIC0yNjMsNiArMjY1LDcgQEAgUnVubmlu ZzogdGVzdFByb3Zpc2lvbmFsQnJlYWtwb2ludHNSZXNvbHZlCiAgICAgYnJlYWtwb2ludEFkZGVk KGEuanMsIDEwLCBmb28gPT0gYmFyLCB0cnVlKQogICAgIExvY2F0aW9uIGNyZWF0ZWQ6IGEuanM6 MTAKICAgUmVzZXR0aW5nIGRlYnVnZ2VyLgorICBSZXNldHRpbmcgd29ya3NwYWNlLgogICAgIGJy ZWFrcG9pbnRSZW1vdmVkKGEuanMsIDEwKQogICAgIExvY2F0aW9uIGRpc3Bvc2VkOiBhLmpzOjEw CiAgIFJlc29sdmluZyBwcm92aXNpb25hbCBicmVha3BvaW50LgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2JyZWFrcG9pbnQtbWFuYWdlci5odG1sIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2JyZWFrcG9pbnQtbWFuYWdlci5odG1sCmluZGV4IDBi NWViNmFlMWY2YzE5MDZmODUzMmRjOWRlYmY0MmY4NDVkYzQxNWEuLjJiODYxMzE5YTEyMTg3YTBk NTJhNjZjMDU5MzJjNTRiMzI3OTJhMzMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9kZWJ1Z2dlci9icmVha3BvaW50LW1hbmFnZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvYnJlYWtwb2ludC1tYW5hZ2VyLmh0bWwKQEAgLTk0LDcgKzk0LDYgQEAg ZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIHsKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRk UmVzdWx0KCIgIFJlc2V0dGluZyBkZWJ1Z2dlci4iKTsKICAgICAgICAgICAgIHRoaXMuX3Njcmlw dHMgPSB7fTsKLSAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYklu c3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5HbG9iYWxPYmplY3RDbGVhcmVkKTsKICAgICAg ICAgfSwKIAogICAgICAgICBzZXRTb3VyY2VNYXBwaW5nOiBmdW5jdGlvbihzb3VyY2VNYXBwaW5n KQpAQCAtMTA1LDYgKzEwNCwyNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICB9CiAgICAgRGVidWdn ZXJNb2RlbE1vY2sucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJv dG90eXBlOwogCisgICAgZnVuY3Rpb24gV29ya3NwYWNlTW9jaygpCisgICAgeworICAgIH0KKwor ICAgIFdvcmtzcGFjZU1vY2sucHJvdG90eXBlID0geworICAgICAgICBfYWRkVUlTb3VyY2VDb2Rl OiBmdW5jdGlvbih1cmwpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUg PSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UodXJsLCBudWxsLCBudWxsLCBkZWZh dWx0TWFwcGluZywgZmFsc2UpOworICAgICAgICAgICAgdWlTb3VyY2VDb2Rlc1t1cmxdID0gdWlT b3VyY2VDb2RlOworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2Vi SW5zcGVjdG9yLlVJU291cmNlQ29kZVByb3ZpZGVyLkV2ZW50cy5VSVNvdXJjZUNvZGVBZGRlZCwg dWlTb3VyY2VDb2RlKTsKKyAgICAgICAgICAgIHJldHVybiB1aVNvdXJjZUNvZGU7CisgICAgICAg IH0sCisKKyAgICAgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKKyAgICAgICAgeworICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIiAgUmVzZXR0aW5nIHdvcmtzcGFjZS4iKTsKKyAgICAg ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Xb3Jrc3Bh Y2UuRXZlbnRzLldvcmtzcGFjZVJlc2V0KTsKKyAgICAgICAgfQorICAgIH0KKyAgICBXb3Jrc3Bh Y2VNb2NrLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlw ZTsKKwogICAgIHZhciBkdW1teVNldHRpbmcgPSB7CiAgICAgICAgIGdldDogZnVuY3Rpb24oKSB7 IHJldHVybiBbXTsgfSwKICAgICAgICAgc2V0OiBmdW5jdGlvbihicmVha3BvaW50cykgeyB9CkBA IC0xMzYsMTAgKzE1Niw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgIHsKICAgICAgICAgYnJlYWtw b2ludE1hbmFnZXIuX2RlYnVnZ2VyTW9kZWwuX2FkZFNjcmlwdCh1cmwsIHVybCk7CiAgICAgICAg IEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCIgIEFkZGluZyBVSVNvdXJjZUNvZGU6ICIgKyB1cmwg KyAiKSIpOwotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5KYXZh U2NyaXB0U291cmNlKHVybCwgbnVsbCwgbnVsbCwgZGVmYXVsdE1hcHBpbmcsIGZhbHNlKTsKLSAg ICAgICAgdWlTb3VyY2VDb2Rlc1t1cmxdID0gdWlTb3VyY2VDb2RlOwotICAgICAgICBicmVha3Bv aW50TWFuYWdlci5yZXN0b3JlQnJlYWtwb2ludHModWlTb3VyY2VDb2RlKTsKLSAgICAgICAgcmV0 dXJuIHVpU291cmNlQ29kZTsKKyAgICAgICAgcmV0dXJuIGJyZWFrcG9pbnRNYW5hZ2VyLl93b3Jr c3BhY2UuX2FkZFVJU291cmNlQ29kZSh1cmwpOwogICAgIH0KIAogICAgIGZ1bmN0aW9uIGNyZWF0 ZUJyZWFrcG9pbnQodWlTb3VyY2VDb2RlSWQsIGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxl ZCkKQEAgLTE2Miw3ICsxNzksOCBAQCBmdW5jdGlvbiB0ZXN0KCkKIAogICAgICAgICB2YXIgc291 cmNlTWFwcGluZyA9IHNvdXJjZU1hcHBpbmcgfHwgZGVmYXVsdE1hcHBpbmc7CiAgICAgICAgIHZh ciBkZWJ1Z2dlck1vZGVsID0gbmV3IERlYnVnZ2VyTW9kZWxNb2NrKHNvdXJjZU1hcHBpbmcpOwot ICAgICAgICB2YXIgYnJlYWtwb2ludE1hbmFnZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkJyZWFrcG9p bnRNYW5hZ2VyKHNldHRpbmcsIGRlYnVnZ2VyTW9kZWwsIHNvdXJjZU1hcHBpbmcpOworICAgICAg ICB2YXIgd29ya3NwYWNlTW9jayA9IG5ldyBXb3Jrc3BhY2VNb2NrKCk7CisgICAgICAgIHZhciBi cmVha3BvaW50TWFuYWdlciA9IG5ldyBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIoc2V0 dGluZywgZGVidWdnZXJNb2RlbCwgd29ya3NwYWNlTW9jayk7CiAgICAgICAgIGJyZWFrcG9pbnRN YW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLkV2 ZW50cy5CcmVha3BvaW50QWRkZWQsIGJyZWFrcG9pbnRBZGRlZCk7CiAgICAgICAgIGJyZWFrcG9p bnRNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2Vy LkV2ZW50cy5CcmVha3BvaW50UmVtb3ZlZCwgYnJlYWtwb2ludFJlbW92ZWQpOwogICAgICAgICBJ bnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiICBDcmVhdGVkIGJyZWFrcG9pbnRzIG1hbmFnZXIiKTsK QEAgLTI4OSwxMCArMzA3LDEyIEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmFkZFJlc3VsdCgiXG4gIE5hdmlnYXRpbmcgdG8gQi4iKTsKICAgICAgICAgICAg IGJyZWFrcG9pbnRNYW5hZ2VyLl9kZWJ1Z2dlck1vZGVsLnJlc2V0KCk7CisgICAgICAgICAgICBi cmVha3BvaW50TWFuYWdlci5fd29ya3NwYWNlLnJlc2V0KCk7CiAgICAgICAgICAgICB2YXIgdWlT b3VyY2VDb2RlQiA9IGFkZFVJU291cmNlQ29kZShicmVha3BvaW50TWFuYWdlciwgImIuanMiKTsK IAogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlxuICBOYXZpZ2F0aW5nIGJh Y2sgdG8gQS4iKTsKICAgICAgICAgICAgIGJyZWFrcG9pbnRNYW5hZ2VyLl9kZWJ1Z2dlck1vZGVs LnJlc2V0KCk7CisgICAgICAgICAgICBicmVha3BvaW50TWFuYWdlci5fd29ya3NwYWNlLnJlc2V0 KCk7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiICBSZXNvbHZpbmcgcHJv dmlzaW9uYWwgYnJlYWtwb2ludC4iKTsKICAgICAgICAgICAgIHZhciBldmVudERhdGEgPSB7IGJy ZWFrcG9pbnRJZDogImEuanM6MTAiLCBsb2NhdGlvbjogeyBzY3JpcHRJZDogImEuanMiLCBsaW5l TnVtYmVyOiAxMSwgY29sdW1uTnVtYmVyOiA1IH19OwogICAgICAgICAgICAgYnJlYWtwb2ludE1h bmFnZXIuX2RlYnVnZ2VyTW9kZWwuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rv ci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5CcmVha3BvaW50UmVzb2x2ZWQsIGV2ZW50RGF0YSk7CkBA IC0zMjYsNiArMzQ2LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICB2YXIgYnJlYWtw b2ludE1hbmFnZXIgPSBjcmVhdGVCcmVha3BvaW50TWFuYWdlcihzZXJpYWxpemVkQnJlYWtwb2lu dHMpOwogICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IGFkZFVJU291cmNlQ29kZShicmVh a3BvaW50TWFuYWdlciwgImEuanMiKTsKICAgICAgICAgICAgIGJyZWFrcG9pbnRNYW5hZ2VyLl9k ZWJ1Z2dlck1vZGVsLnJlc2V0KCk7CisgICAgICAgICAgICBicmVha3BvaW50TWFuYWdlci5fd29y a3NwYWNlLnJlc2V0KCk7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiICBS ZXNvbHZpbmcgcHJvdmlzaW9uYWwgYnJlYWtwb2ludC4iKTsKICAgICAgICAgICAgIHZhciBldmVu dERhdGEgPSB7IGJyZWFrcG9pbnRJZDogImEuanM6MTAiLCBsb2NhdGlvbjogeyBzY3JpcHRJZDog ImEuanMiLCBsaW5lTnVtYmVyOiAxMSwgY29sdW1uTnVtYmVyOiA1IH19OwogICAgICAgICAgICAg YnJlYWtwb2ludE1hbmFnZXIuX2RlYnVnZ2VyTW9kZWwuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5CcmVha3BvaW50UmVzb2x2ZWQsIGV2 ZW50RGF0YSk7Cg==