90616 2012-07-05 09:49:32 -0700 Web Inspector: Workspace should dispatch WorkspaceReset event on navigation. 2012-07-06 02:46:53 -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 663594 0 vsevik 2012-07-05 09:49:32 -0700 Currently styles and scripts are reset independently on sources panel. This can lead to performance issues (like loading of resources content when some tabs are closed while others are still shown). Also we want to remove uiSourceCodes from the TabbedEditorContainer in UISourceCodeRemoved event handler. This means we should not dispatch these events on navigation because this will lead to the same performance problems. 663599 1 150951 vsevik 2012-07-05 10:05:38 -0700 Created attachment 150951 Patch 663973 2 vsevik 2012-07-06 02:46:53 -0700 Committed r121949: <http://trac.webkit.org/changeset/121949> 150951 2012-07-05 10:05:38 -0700 2012-07-06 02:41:43 -0700 Patch bug-90616-20120705210536.patch text/plain 18309 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmNhNjI0OGY2ZDNlNmU1 M2I1ODNlYzQ0M2U4ZTc1ZTcyNmRlZDUxNi4uY2VlODY0MmRhOTA0N2I5YmQwYzVjMjg5N2MzMTgy MGM0NGE3ODI0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA3LTA1ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFdvcmtzcGFjZSBzaG91bGQgZGlzcGF0Y2ggV29ya3NwYWNlUmVzZXQgZXZlbnQgb24gbmF2 aWdhdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTkwNjE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg V29ya3NwYWNlIFVJU291cmNlQ29kZVByb3ZpZGVycyBhcmUgbm93IHJlc2V0IG9uIG5hdmlnYXRp b24uCisgICAgICAgIFVJU291cmNlQ29kZVJlbW92ZWQgZXZlbnQgaXMgbm90IGRpc3BhdGNoZWQg ZnJvbSBVSVNvdXJjZUNvZGVQcm92aWRlcnMgb24gcmVzZXQgKHBhZ2UgbmF2aWdhdGlvbikgYW55 bW9yZS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBw aW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZy5wcm90 b3R5cGUucmVzZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJTY3Jp cHRNYXBwaW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2NyaXB0TWFwcGlu Zyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTY3JpcHRNYXBwaW5nLnByb3RvdHlw ZS5fdWlTb3VyY2VDb2RlUmVtb3ZlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRTbmlwcGV0TW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBl dE1vZGVsLnByb3RvdHlwZS5fcmVzZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90 b3R5cGUuX2xvYWRVSVNvdXJjZUNvZGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlLl9yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLnByb3RvdHlwZS5jYW5TaG93QW5jaG9yTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3RvZ2dsZUZvcm1hdFNvdXJjZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5zaG93R29Ub1NvdXJjZURpYWxv Zyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TdHlsZXNVSVNvdXJjZUNvZGVQcm92aWRlcik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU3R5bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBlLnJlc2V0KToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtzcGFjZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Db21wb3NpdGVVSVNvdXJjZUNvZGVQcm92aWRlci5wcm90b3R5cGUudWlTb3Vy Y2VDb2RlUHJvdmlkZXJzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2UpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLldvcmtzcGFjZS5wcm90b3R5cGUucmVnaXN0ZXJVSVNvdXJjZUNv ZGVQcm92aWRlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuV29ya3NwYWNlLnByb3RvdHlwZS5f cmVzZXQpOgorCiAyMDEyLTA3LTA1ICBQZXRlciBXYW5nICA8cGV0ZXIud2FuZ0B0b3JjaG1vYmls ZS5jb20uY24+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogW0pTQ10gc3VwcG9ydCBKUyBleGVj dXRpb24gaW4gdGhlIGNvbnRleHQgb2YgYW4gaXNvbGF0ZWQgd29ybGQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBwaW5nLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNjcmlwdE1hcHBp bmcuanMKaW5kZXggZDJjOTE3NjE0NWUwYzhlYmI1ODRmMGViMTRhYjk5NDU5NTk2NzZmNy4uZGY1 Y2EyY2IzYmQ1ZTk3NjNkMTkyYTE3NzgwN2FkOGFjNjUwNWZhYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNjcmlwdE1hcHBpbmcuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNjcmlwdE1hcHBp bmcuanMKQEAgLTE2MiwxMCArMTYyLDYgQEAgV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFw cGluZy5wcm90b3R5cGUgPSB7CiAKICAgICByZXNldDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAg ICAgdmFyIHVpU291cmNlQ29kZXMgPSB0aGlzLnVpU291cmNlQ29kZXMoKTsKLSAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCB1aVNvdXJjZUNvZGVzLmxlbmd0aDsgKytpKQotICAgICAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZVBy b3ZpZGVyLkV2ZW50cy5VSVNvdXJjZUNvZGVSZW1vdmVkLCB1aVNvdXJjZUNvZGVzW2ldKTsKLQog ICAgICAgICB0aGlzLl9zb3VyY2VNYXBCeVVSTCA9IHt9OwogICAgICAgICB0aGlzLl9zb3VyY2VN YXBGb3JTY3JpcHRJZCA9IHt9OwogICAgICAgICB0aGlzLl9zY3JpcHRGb3JTb3VyY2VNYXAgPSBu ZXcgTWFwKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RlYnVnZ2VyU2NyaXB0TWFwcGluZy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGVidWdnZXJTY3JpcHRNYXBwaW5nLmpzCmluZGV4IDFlNWJjMDZlYTc1ODU2YzUwMGMz Mzc2MDlmNWJjYWIxM2EyMTUzYzcuLjljNTAzNGE0OTRmNTY2MDRjODE3MzI1OWE3MjJkMWJjZmMy ZmM2MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVi dWdnZXJTY3JpcHRNYXBwaW5nLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGVidWdnZXJTY3JpcHRNYXBwaW5nLmpzCkBAIC00NCw3ICs0NCw2IEBAIFdlYkluc3Bl Y3Rvci5EZWJ1Z2dlclNjcmlwdE1hcHBpbmcgPSBmdW5jdGlvbigpCiAKICAgICBXZWJJbnNwZWN0 b3IuZGVidWdnZXJNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1v ZGVsLkV2ZW50cy5QYXJzZWRTY3JpcHRTb3VyY2UsIHRoaXMuX3BhcnNlZFNjcmlwdFNvdXJjZSwg dGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuRmFpbGVkVG9QYXJzZVNjcmlwdFNvdXJj ZSwgdGhpcy5fcGFyc2VkU2NyaXB0U291cmNlLCB0aGlzKTsKLSAgICBXZWJJbnNwZWN0b3IuZGVi dWdnZXJNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2 ZW50cy5HbG9iYWxPYmplY3RDbGVhcmVkLCB0aGlzLl9kZWJ1Z2dlclJlc2V0LCB0aGlzKTsKIH0K IAogV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CkBAIC04 MywxMSArODIsNSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJTY3JpcHRNYXBwaW5nLnByb3RvdHlw ZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIHJldHVybiB0aGlzLl9yZXNvdXJjZU1hcHBpbmc7 Ci0gICAgfSwKLQotICAgIF9kZWJ1Z2dlclJlc2V0OiBmdW5jdGlvbigpCi0gICAgewotICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX21hcHBpbmdzLmxlbmd0aDsgKytpKQotICAgICAg ICAgICAgdGhpcy5fbWFwcGluZ3NbaV0ucmVzZXQoKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlU2NyaXB0TWFwcGluZy5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VTY3JpcHRNYXBw aW5nLmpzCmluZGV4IGQ3ODY4ZmFiMzA3MzhkNjhmMjA4ODc1YWQ1NDRhMmE0ZWVmZmRkYTYuLjZl MjUxOWYyNmJjNzVhMGMwYjI0OGY2MjAwNjFjYmJhYTE1NmM1ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VTY3JpcHRNYXBwaW5nLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VTY3JpcHRNYXBw aW5nLmpzCkBAIC0xOTUsNyArMTk1LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFw cGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghdWlTb3VyY2VDb2RlLnVybCkKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZUZvclVJU291cmNlQ29k ZS5yZW1vdmUodWlTb3VyY2VDb2RlKTsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0 ZW5lcnMoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZVByb3ZpZGVyLkV2ZW50cy5VSVNvdXJjZUNv ZGVSZW1vdmVkLCB1aVNvdXJjZUNvZGUpOwogICAgIH0sCiAKICAgICAvKioKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwu anMKaW5kZXggMmZhNDk3YzI2MTgwZTA2NGI2OTBhOGQ0YTM3MTUzMWQzMzY3MGI2Yy4uNDA1MWYy OTUzNzc3Yjg2MTA1YzQwMjM3MTQ3MWQ2YWFjZDUzNGJkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKQEAg LTM2Miw4ICszNjIsNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdmFyIHJlbW92ZWRVSVNvdXJjZUNvZGVzID0gdGhpcy5fcmVsZWFzZWRV SVNvdXJjZUNvZGVzKCk7CiAgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUZvclNjcmlwdElkID0g e307CiAgICAgICAgIHRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29kZSA9IG5ldyBNYXAoKTsKLSAg ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZW1vdmVkVUlTb3VyY2VDb2Rlcy5sZW5ndGg7ICsr aSkKLSAgICAgICAgICAgIHRoaXMuX3NuaXBwZXRTY3JpcHRNYXBwaW5nLl9maXJlVUlTb3VyY2VD b2RlUmVtb3ZlZChyZW1vdmVkVUlTb3VyY2VDb2Rlc1tpXSk7CiAgICAgfQogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4 IDY1Y2Q5NjVlZjI5YjhmYjI2NGUzZjhlOTVhNDNhZGYxYjliNjJkZTkuLjhmMGZmM2Y4ODkxMmIz ODg5MjgzZTNlNjY4ZWRjYTI1YjJhNWJmNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0yOSw5ICsyOSw5IEBACiAgKiBA aW1wbGVtZW50cyB7V2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lckRlbGVnYXRlfQog ICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rvci5Db250ZXh0TWVudS5Qcm92aWRlcn0KICAqIEBl eHRlbmRzIHtXZWJJbnNwZWN0b3IuUGFuZWx9Ci0gKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGVQcm92aWRlcj19IHVpU291cmNlQ29kZVByb3ZpZGVyRm9yVGVzdAorICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuV29ya3NwYWNlPX0gd29ya3NwYWNlRm9yVGVzdAogICovCi1XZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24odWlTb3VyY2VDb2RlUHJvdmlkZXJGb3JUZXN0 KQorV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHdvcmtzcGFjZUZvclRlc3Qp CiB7CiAgICAgV2ViSW5zcGVjdG9yLlBhbmVsLmNhbGwodGhpcywgInNjcmlwdHMiKTsKICAgICB0 aGlzLnJlZ2lzdGVyUmVxdWlyZWRDU1MoInNjcmlwdHNQYW5lbC5jc3MiKTsKQEAgLTQwLDcgKzQw LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHVpU291cmNlQ29kZVBy b3ZpZGVyRm9yVGVzdCkKICAgICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MubmF2aWdhdG9yV2FzT25j ZUhpZGRlbiA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5jcmVhdGVTZXR0aW5nKCJuYXZpZ2F0b3JX YXNPbmNlSGlkZGVuIiwgZmFsc2UpOwogICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5kZWJ1Z2dl clNpZGViYXJIaWRkZW4gPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuY3JlYXRlU2V0dGluZygiZGVi dWdnZXJTaWRlYmFySGlkZGVuIiwgZmFsc2UpOwogCi0gICAgdGhpcy5fdWlTb3VyY2VDb2RlUHJv dmlkZXIgPSB1aVNvdXJjZUNvZGVQcm92aWRlckZvclRlc3QgfHwgV2ViSW5zcGVjdG9yLndvcmtz cGFjZTsKKyAgICB0aGlzLl93b3Jrc3BhY2UgPSB3b3Jrc3BhY2VGb3JUZXN0IHx8IFdlYkluc3Bl Y3Rvci53b3Jrc3BhY2U7CiAKICAgICBmdW5jdGlvbiB2aWV3R2V0dGVyKCkKICAgICB7CkBAIC0x NjYsMTggKzE2NiwxOCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24odWlT b3VyY2VDb2RlUHJvdmlkZXJGb3JUZXN0KQogICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVs LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkNhbGxG cmFtZVNlbGVjdGVkLCB0aGlzLl9jYWxsRnJhbWVTZWxlY3RlZCwgdGhpcyk7CiAgICAgV2ViSW5z cGVjdG9yLmRlYnVnZ2VyTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdn ZXJNb2RlbC5FdmVudHMuQ29uc29sZUNvbW1hbmRFdmFsdWF0ZWRJblNlbGVjdGVkQ2FsbEZyYW1l LCB0aGlzLl9jb25zb2xlQ29tbWFuZEV2YWx1YXRlZEluU2VsZWN0ZWRDYWxsRnJhbWUsIHRoaXMp OwogICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkV4ZWN1dGlvbkxpbmVDaGFuZ2VkLCB0aGlzLl9l eGVjdXRpb25MaW5lQ2hhbmdlZCwgdGhpcyk7Ci0gICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9k ZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuR2xv YmFsT2JqZWN0Q2xlYXJlZCwgdGhpcy5fcmVzZXQuYmluZCh0aGlzLCBmYWxzZSkpOwogICAgIFdl Ykluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRl YnVnZ2VyTW9kZWwuRXZlbnRzLkJyZWFrcG9pbnRzQWN0aXZlU3RhdGVDaGFuZ2VkLCB0aGlzLl9i cmVha3BvaW50c0FjdGl2ZVN0YXRlQ2hhbmdlZCwgdGhpcyk7CiAKLSAgICB0aGlzLl91aVNvdXJj ZUNvZGVQcm92aWRlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQ cm92aWRlci5FdmVudHMuVUlTb3VyY2VDb2RlQWRkZWQsIHRoaXMuX2hhbmRsZVVJU291cmNlQ29k ZUFkZGVkLCB0aGlzKTsKLSAgICB0aGlzLl91aVNvdXJjZUNvZGVQcm92aWRlci5hZGRFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRlci5FdmVudHMuVUlTb3VyY2VD b2RlUmVwbGFjZWQsIHRoaXMuX3VpU291cmNlQ29kZVJlcGxhY2VkLCB0aGlzKTsKLSAgICB0aGlz Ll91aVNvdXJjZUNvZGVQcm92aWRlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGVQcm92aWRlci5FdmVudHMuVUlTb3VyY2VDb2RlUmVtb3ZlZCwgdGhpcy5fdWlTb3Vy Y2VDb2RlUmVtb3ZlZCwgdGhpcyk7CisgICAgdGhpcy5fd29ya3NwYWNlLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZVByb3ZpZGVyLkV2ZW50cy5VSVNvdXJjZUNvZGVB ZGRlZCwgdGhpcy5faGFuZGxlVUlTb3VyY2VDb2RlQWRkZWQsIHRoaXMpOworICAgIHRoaXMuX3dv cmtzcGFjZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRl ci5FdmVudHMuVUlTb3VyY2VDb2RlUmVwbGFjZWQsIHRoaXMuX3VpU291cmNlQ29kZVJlcGxhY2Vk LCB0aGlzKTsKKyAgICB0aGlzLl93b3Jrc3BhY2UuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlUHJvdmlkZXIuRXZlbnRzLlVJU291cmNlQ29kZVJlbW92ZWQsIHRoaXMu X3VpU291cmNlQ29kZVJlbW92ZWQsIHRoaXMpOworICAgIHRoaXMuX3dvcmtzcGFjZS5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2UuRXZlbnRzLldvcmtzcGFjZVJlc2V0LCB0 aGlzLl9yZXNldC5iaW5kKHRoaXMsIGZhbHNlKSwgdGhpcyk7CiAKICAgICB2YXIgZW5hYmxlRGVi dWdnZXIgPSAhQ2FwYWJpbGl0aWVzLmRlYnVnZ2VyQ2F1c2VzUmVjb21waWxhdGlvbiB8fCBXZWJJ bnNwZWN0b3Iuc2V0dGluZ3MuZGVidWdnZXJFbmFibGVkLmdldCgpOwogICAgIGlmIChlbmFibGVE ZWJ1Z2dlcikKICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuZW5hYmxlRGVidWdn ZXIoKTsKIAotICAgIFdlYkluc3BlY3Rvci5hZHZhbmNlZFNlYXJjaENvbnRyb2xsZXIucmVnaXN0 ZXJTZWFyY2hTY29wZShuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdHNTZWFyY2hTY29wZSh0aGlzLl91 aVNvdXJjZUNvZGVQcm92aWRlcikpOworICAgIFdlYkluc3BlY3Rvci5hZHZhbmNlZFNlYXJjaENv bnRyb2xsZXIucmVnaXN0ZXJTZWFyY2hTY29wZShuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdHNTZWFy Y2hTY29wZSh0aGlzLl93b3Jrc3BhY2UpKTsKICAgICBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUu cmVnaXN0ZXJQcm92aWRlcih0aGlzKTsKIH0KIApAQCAtMjM3LDcgKzIzNyw3IEBAIFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgX2xvYWRVSVNvdXJjZUNvZGVz OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlcyA9IHRoaXMuX3Vp U291cmNlQ29kZVByb3ZpZGVyLnVpU291cmNlQ29kZXMoKTsKKyAgICAgICAgdmFyIHVpU291cmNl Q29kZXMgPSB0aGlzLl93b3Jrc3BhY2UudWlTb3VyY2VDb2RlcygpOwogICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHVpU291cmNlQ29kZXMubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB0aGlz Ll91aVNvdXJjZUNvZGVBZGRlZCh1aVNvdXJjZUNvZGVzW2ldKTsKICAgICB9LApAQCAtMzY1LDYg KzM2NSwxMCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLndvcmtlcnMucmVzZXQoKTsKICAgICAgICAgV2ViSW5z cGVjdG9yLlJldmlzaW9uSGlzdG9yeVZpZXcucmVzZXQoKTsKIAorICAgICAgICB2YXIgdWlTb3Vy Y2VDb2RlcyA9IHRoaXMuX3dvcmtzcGFjZS51aVNvdXJjZUNvZGVzKCk7CisgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgdWlTb3VyY2VDb2Rlcy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgIHRo aXMuX3JlbW92ZVNvdXJjZUZyYW1lKHVpU291cmNlQ29kZXNbaV0pOworCiAgICAgICAgIHRoaXMu X2xvYWRVSVNvdXJjZUNvZGVzKCk7CiAgICAgfSwKIApAQCAtMzg5LDcgKzM5Myw3IEBAIFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKHRo aXMuX2RlYnVnZ2VyRW5hYmxlZCAmJiBhbmNob3IudWlTb3VyY2VDb2RlKQogICAgICAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgICAgIHZhciB1aVNvdXJjZUNvZGVzID0gdGhpcy5fdWlTb3VyY2VD b2RlUHJvdmlkZXIudWlTb3VyY2VDb2RlcygpOworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlcyA9 IHRoaXMuX3dvcmtzcGFjZS51aVNvdXJjZUNvZGVzKCk7CiAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgdWlTb3VyY2VDb2Rlcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgaWYgKHVpU291 cmNlQ29kZXNbaV0udXJsID09PSBhbmNob3IuaHJlZikgewogICAgICAgICAgICAgICAgIGFuY2hv ci51aVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGVzW2ldOwpAQCAtOTM1LDcgKzkzOSw3IEBAIFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgIF90b2dnbGVGb3JtYXRT b3VyY2U6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX3RvZ2dsZUZvcm1hdFNvdXJj ZUJ1dHRvbi50b2dnbGVkID0gIXRoaXMuX3RvZ2dsZUZvcm1hdFNvdXJjZUJ1dHRvbi50b2dnbGVk OwotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlcyA9IHRoaXMuX3VpU291cmNlQ29kZVByb3ZpZGVy LnVpU291cmNlQ29kZXMoKTsKKyAgICAgICAgdmFyIHVpU291cmNlQ29kZXMgPSB0aGlzLl93b3Jr c3BhY2UudWlTb3VyY2VDb2RlcygpOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHVpU291 cmNlQ29kZXMubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB1aVNvdXJjZUNvZGVzW2ldLnNldEZv cm1hdHRlZCh0aGlzLl90b2dnbGVGb3JtYXRTb3VyY2VCdXR0b24udG9nZ2xlZCk7CiAgICAgfSwK QEAgLTEwNzIsNyArMTA3Niw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBl ID0gewogICAgIHNob3dHb1RvU291cmNlRGlhbG9nOiBmdW5jdGlvbigpCiAgICAgewogICAgICAg ICBXZWJJbnNwZWN0b3IuaW5zcGVjdG9yVmlldy5zZXRDdXJyZW50UGFuZWwodGhpcyk7Ci0gICAg ICAgIFdlYkluc3BlY3Rvci5PcGVuUmVzb3VyY2VEaWFsb2cuc2hvdyh0aGlzLCB0aGlzLl91aVNv dXJjZUNvZGVQcm92aWRlciwgdGhpcy5lZGl0b3JWaWV3Lm1haW5FbGVtZW50KTsKKyAgICAgICAg V2ViSW5zcGVjdG9yLk9wZW5SZXNvdXJjZURpYWxvZy5zaG93KHRoaXMsIHRoaXMuX3dvcmtzcGFj ZSwgdGhpcy5lZGl0b3JWaWV3Lm1haW5FbGVtZW50KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzUGFuZWwuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1BhbmVsLmpzCmluZGV4IDFjYjQw MjAzMGRlNmVkODFjYTVjNzVmNDkzM2M3MGRmZmRiNTAwOGEuLjg3YjA5YjQzNTdkODNkODA3OTg0 ZWYyNDZlZDMzNWIwMmI3ZWUxYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU3R5bGVzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qcwpAQCAtMzQsOCArMzQsNyBAQAogV2ViSW5zcGVjdG9y LlN0eWxlc1VJU291cmNlQ29kZVByb3ZpZGVyID0gZnVuY3Rpb24oKQogewogICAgIFdlYkluc3Bl Y3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNv dXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkNhY2hlZFJlc291cmNlc0xvYWRlZCwgdGhpcy5faW5p dGlhbGl6ZSwgdGhpcyk7Ci0gICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuV2ls bExvYWRDYWNoZWRSZXNvdXJjZXMsIHRoaXMuX3Jlc2V0LCB0aGlzKTsKLSAgICBXZWJJbnNwZWN0 b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5NYWluRnJhbWVOYXZpZ2F0ZWQsIHRoaXMuX3Jlc2V0LCB0 aGlzKTsKKyAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5XaWxsTG9hZENhY2hl ZFJlc291cmNlcywgdGhpcy5yZXNldCwgdGhpcyk7CiAKICAgICB0aGlzLl91aVNvdXJjZUNvZGVz ID0gW107CiB9CkBAIC03OSw3ICs3OCw3IEBAIFdlYkluc3BlY3Rvci5TdHlsZXNVSVNvdXJjZUNv ZGVQcm92aWRlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRlci5FdmVudHMuVUlTb3VyY2VD b2RlQWRkZWQsIHVpU291cmNlQ29kZSk7CiAgICAgfSwKIAotICAgIF9yZXNldDogZnVuY3Rpb24o KQorICAgIHJlc2V0OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl91aVNvdXJjZUNv ZGVzID0gW107CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Xb3Jrc3BhY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1dvcmtzcGFjZS5qcwppbmRleCA5NzJjZDZhN2ZmNWY5NzVlYTA3MThkZDU0ODhmODg0Mzc1NmFh MzZlLi4zZGJkZWQ2YzhmOTgzOWFiMGIzMjU3M2VlNmZlNTYyYzVhNThiNWRkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtzcGFjZS5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtzcGFjZS5qcwpAQCAtNzYsNiAr NzYsMTQgQEAgV2ViSW5zcGVjdG9yLkNvbXBvc2l0ZVVJU291cmNlQ29kZVByb3ZpZGVyLnByb3Rv dHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCisgICAgICogQHJldHVybiB7QXJyYXkuPFdlYklu c3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRlcj59CisgICAgICovCisgICAgdWlTb3VyY2VDb2Rl UHJvdmlkZXJzOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fdWlTb3Vy Y2VDb2RlUHJvdmlkZXJzLnNsaWNlKDApOworICAgIH0sCisKKyAgICAvKioKICAgICAgKiBAcGFy YW0ge3N0cmluZ30gdXJsCiAgICAgICogQHJldHVybiB7P1dlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGV9CiAgICAgICovCkBAIC0xMjAsNiArMTI4LDEyIEBAIFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2Ug PSBmdW5jdGlvbigpCiAgICAgV2ViSW5zcGVjdG9yLkNvbXBvc2l0ZVVJU291cmNlQ29kZVByb3Zp ZGVyLmNhbGwodGhpcywgcHJvdmlkZXJzKTsKICAgICAKICAgICBuZXcgV2ViSW5zcGVjdG9yLlBy ZXNlbnRhdGlvbkNvbnNvbGVNZXNzYWdlSGVscGVyKHRoaXMpOworICAgIAorICAgIFdlYkluc3Bl Y3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNv dXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLk1haW5GcmFtZU5hdmlnYXRlZCwgdGhpcy5fcmVzZXQs IHRoaXMpOworfQorCitXZWJJbnNwZWN0b3IuV29ya3NwYWNlLkV2ZW50cyA9IHsKKyAgICBXb3Jr c3BhY2VSZXNldDogIldvcmtzcGFjZVJlc2V0IgogfQogCiBXZWJJbnNwZWN0b3IuV29ya3NwYWNl LnByb3RvdHlwZSA9IHsKQEAgLTEyOSw2ICsxNDMsMTUgQEAgV2ViSW5zcGVjdG9yLldvcmtzcGFj ZS5wcm90b3R5cGUgPSB7CiAgICAgcmVnaXN0ZXJVSVNvdXJjZUNvZGVQcm92aWRlcjogZnVuY3Rp b24odWlTb3VyY2VDb2RlUHJvdmlkZXIpCiAgICAgewogICAgICAgICB0aGlzLl9yZWdpc3RlclVJ U291cmNlQ29kZVByb3ZpZGVyKHVpU291cmNlQ29kZVByb3ZpZGVyKTsKKyAgICB9LAorCisgICAg X3Jlc2V0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlUHJvdmlk ZXJzID0gdGhpcy51aVNvdXJjZUNvZGVQcm92aWRlcnMoKTsKKyAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCB1aVNvdXJjZUNvZGVQcm92aWRlcnMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAg IHVpU291cmNlQ29kZVByb3ZpZGVyc1tpXS5yZXNldCgpOworICAgICAgICB9CisgICAgICAgIHRo aXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2UuRXZlbnRz LldvcmtzcGFjZVJlc2V0LCBudWxsKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4ZjM5NGY3NWFlMzNh N2JlYTJlODhkMTM4ODRkZDdjZTgwMDI3ZWE0Li5iN2FlNDQyZTI5ZTYxODdjZWMzNjJlYmEwYWE0 ZWY4YzQwNzdiMTk5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDctMDUgIFZzZXZvbG9k IFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog V29ya3NwYWNlIHNob3VsZCBkaXNwYXRjaCBXb3Jrc3BhY2VSZXNldCBldmVudCBvbiBuYXZpZ2F0 aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA2 MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0 dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanM6CisgICAgICAgIChpbml0aWFsaXpl X0RlYnVnZ2VyVGVzdCk6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL2xpbmtpZmllci5o dG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWw6Cisg ICAgICAgICogaW5zcGVjdG9yL3N0eWxlcy9lZGl0LWluc3BlY3Rvci1zdHlsZXNoZWV0Lmh0bWw6 CisKIDIwMTItMDctMDUgIEtyaXN0w7NmIEtvc3p0ecOzICA8a2tyaXN0b2ZAaW5mLnUtc3plZ2Vk Lmh1PgogCiAgICAgICAgIFtRdF0gVW5yZXZpZXdlZCBnYXJkZW5pbmcgYWZ0ZXIgcjEyMTg5MS4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRl c3QuanMgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0Lmpz CmluZGV4IGE3YTZlYjVjOWQ4NDljMzcxYjBhOTJjYzJkMDJlMjExOTIzZjRkNjYuLmM2MGU1ZTcx N2MxMWY4Y2FhZDZlOGM3YzJjZWU0MzhmZTIyZTlkYmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMKKysrIGIvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5qcwpAQCAtMTYwLDcgKzE2MCw3IEBA IEluc3BlY3RvclRlc3QuX3Jlc3VtZWRTY3JpcHQgPSBmdW5jdGlvbigpCiAKIEluc3BlY3RvclRl c3Quc2hvd1NjcmlwdFNvdXJjZU9uU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24ocGFuZWwsIHNjcmlw dE5hbWUsIGNhbGxiYWNrKQogewotICAgIHZhciB1aVNvdXJjZUNvZGVzID0gcGFuZWwuX3VpU291 cmNlQ29kZVByb3ZpZGVyLnVpU291cmNlQ29kZXMoKTsKKyAgICB2YXIgdWlTb3VyY2VDb2RlcyA9 IHBhbmVsLl93b3Jrc3BhY2UudWlTb3VyY2VDb2RlcygpOwogICAgIGZvciAodmFyIGkgPSAwOyBp IDwgdWlTb3VyY2VDb2Rlcy5sZW5ndGg7ICsraSkgewogICAgICAgICBpZiAodWlTb3VyY2VDb2Rl c1tpXS5wYXJzZWRVUkwubGFzdFBhdGhDb21wb25lbnQgPT09IHNjcmlwdE5hbWUpIHsKICAgICAg ICAgICAgIHBhbmVsLnNob3dVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2Rlc1tpXSk7CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLmh0bWwgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLmh0bWwKaW5kZXggMWMxMDUzZTdl NGU1Y2NjY2I3ODg0MDdjZDdkY2Q4OTgyNTQ4NjdhYS4uMzE0M2MwYzJjYzdlMDFiZGYxODgwNjM4 ZDIyY2RkMzg1NzA3NmEwZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVn Z2VyL2xpbmtpZmllci5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9s aW5raWZpZXIuaHRtbApAQCAtMzMsNyArMzMsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICB2YXIgdWlT b3VyY2VDb2RlcyA9IFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5fdWlTb3VyY2VDb2RlUHJv dmlkZXIudWlTb3VyY2VDb2RlcygpOworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlcyA9IFdlYklu c3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5fd29ya3NwYWNlLnVpU291cmNlQ29kZXMoKTsKICAgICAg ICAgZm9yICh2YXIgaSA9IDA7IGkgPCB1aVNvdXJjZUNvZGVzLmxlbmd0aDsgKytpKSB7CiAgICAg ICAgICAgICBpZiAodWlTb3VyY2VDb2Rlc1tpXS51cmwgPT09IFdlYkluc3BlY3Rvci5pbnNwZWN0 ZWRQYWdlVVJMKSB7CiAgICAgICAgICAgICAgICAgdWlTb3VyY2VDb2RlID0gdWlTb3VyY2VDb2Rl c1tpXTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRz LXBhbmVsLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5l bC5odG1sCmluZGV4IDAzZmQzNzJmZjM0ZTgxOTM2YWVlMWI2M2ZlMTI1N2M0MjkzMmNjMmEuLjk2 ZGZmMzQ1ZjhkODdiZmM4ZDRhNTc5ODA3M2RiMjA5OTk3OGNhODYgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWwKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbApAQCAtMzgsNyArMzgs NyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgcHJvdmlkZXIuX3Jlc2V0ID0gZnVuY3Rpb24o cHJlc2VydmVkSXRlbXMpCiAgICAgICAgIHsKICAgICAgICAgICAgIHVpU291cmNlQ29kZXMgPSBw cmVzZXJ2ZWRJdGVtcyB8fCBbXTsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1v ZGVsLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5F dmVudHMuR2xvYmFsT2JqZWN0Q2xlYXJlZCk7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuV29ya3NwYWNlLkV2ZW50cy5Xb3Jrc3BhY2VSZXNl dCwgbnVsbCk7CiAgICAgICAgIH0KICAgICAgICAgcHJvdmlkZXIuX3JlcGxhY2VVSVNvdXJjZUNv ZGUgPSBmdW5jdGlvbihvbGRVSVNvdXJjZUNvZGUsIHVpU291cmNlQ29kZSkKICAgICAgICAgewpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9lZGl0LWluc3BlY3Rvci1z dHlsZXNoZWV0Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL2VkaXQtaW5zcGVj dG9yLXN0eWxlc2hlZXQuaHRtbAppbmRleCA5NTIwNTRhNWJmNWVkMTc0ZjYyZTNmZTllNTZjZjQ5 MjhiZmIyNGNiLi45YjI5NDIxMzIyYWQ3YzBkOTkwNzMyZmQ1YzE2YTIwMDkyMTIzYmYzIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL2VkaXQtaW5zcGVjdG9yLXN0eWxl c2hlZXQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL2VkaXQtaW5zcGVj dG9yLXN0eWxlc2hlZXQuaHRtbApAQCAtMTQsNyArMTQsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKIAog ICAgIGZ1bmN0aW9uIHN0ZXAxKG5vZGUpCiAgICAgewotICAgICAgICBXZWJJbnNwZWN0b3IucGFu ZWxzLnNjcmlwdHMuX3VpU291cmNlQ29kZVByb3ZpZGVyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZVByb3ZpZGVyLkV2ZW50cy5VSVNvdXJjZUNvZGVBZGRlZCwgc291 cmNlQ29kZUFkZGVkKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLl93b3Jr c3BhY2UuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlUHJvdmlkZXIu RXZlbnRzLlVJU291cmNlQ29kZUFkZGVkLCBzb3VyY2VDb2RlQWRkZWQpOwogICAgICAgICBXZWJJ bnNwZWN0b3IuY3NzTW9kZWwuYWRkUnVsZShub2RlLmlkLCAiI2luc3BlY3RlZCIsIHN1Y2Nlc3ND YWxsYmFjaywgZmFpbHVyZUNhbGxiYWNrKTsKIAogICAgICAgICBmdW5jdGlvbiBzdWNjZXNzQ2Fs bGJhY2soKSB7IH0K