75343 2011-12-29 04:48:02 -0800 Web Inspector: Scripts navigator should trim long file names and show full url in tooltip. 2011-12-29 10:57:03 -0800 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 527881 0 vsevik 2011-12-29 04:48:02 -0800 Scripts navigator should trim long file names and show full url in tooltip. 527884 1 120733 vsevik 2011-12-29 04:53:03 -0800 Created attachment 120733 Patch 527939 2 120733 pfeldman 2011-12-29 08:30:11 -0800 Comment on attachment 120733 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120733&action=review > Source/WebCore/inspector/front-end/ScriptsNavigator.js:136 > + // Do nothing. Consider removing this method from the interface altogether. 527984 3 vsevik 2011-12-29 10:57:03 -0800 Committed r103812: <http://trac.webkit.org/changeset/103812> 120733 2011-12-29 04:53:03 -0800 2011-12-29 08:30:11 -0800 Patch bug-75343-20111229165301.patch text/plain 21505 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2MyMzJiYTNkNTU5YmU4 MzRjN2ZkZDY1MDI3ZmZmYjhiNGVhNzcyZi4uNTZiNzA3N2Q5NzI3MDcxNzFkOWI5YTk0MzdiMDgy MjU2ZDhiNWY5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDExLTEyLTI5ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFNjcmlwdHMgbmF2aWdhdG9yIHNob3VsZCB0cmltIGxvbmcgZmlsZSBuYW1lcyBhbmQgc2hv dyBmdWxsIHVybCBpbiB0b29sdGlwLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzUzNDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvZGVidWdnZXIvdWktc291cmNlLWNvZGUtZGlz cGxheS1uYW1lLmh0bWwKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05h dmlnYXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3Rv dHlwZS5zZXRTY3JpcHRTb3VyY2VJc0RpcnR5KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu RWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZS5zaG93U291cmNlRnJhbWUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5FZGl0b3JDb250YWluZXIucHJvdG90eXBlLnJlcGxhY2VT b3VyY2VGcmFtZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5TaW5nbGVG aWxlRWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZS5zaG93U291cmNlRnJhbWUpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5TaW5nbGVGaWxlRWRpdG9yQ29udGFpbmVyLnByb3Rv dHlwZS5yZXBsYWNlU291cmNlRnJhbWVzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1RhYmJlZEVkaXRvckNvbnRhaW5lci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRF ZGl0b3JDb250YWluZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRh aW5lci5wcm90b3R5cGUuX2FwcGVuZFNvdXJjZUZyYW1lVGFiKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIucHJvdG90eXBlLl90YWJDbG9zZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lci5wcm90b3R5cGUuX3JlcGxhY2VT b3VyY2VGcmFtZVRhYi5nZXQgaWYpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRv ckNvbnRhaW5lci5wcm90b3R5cGUuX3JlcGxhY2VTb3VyY2VGcmFtZVRhYik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZS5nZXQgcmVwbGFjZVNv dXJjZUZyYW1lcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVy LnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQ YW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBlLmFwcGVu ZFRhYik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90b3R5cGUuY2hhbmdl VGFiVG9vbHRpcCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZVRhYik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZVRhYi5wcm90b3R5cGUuZ2V0IHRvb2x0aXApOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmVUYWIucHJvdG90eXBlLnNldCB0b29sdGlw KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiLnByb3RvdHlwZS5fY3JlYXRl VGFiRWxlbWVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZS5fcGFyc2VV UkwpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzOgorICAgICAg ICAoKToKKwogMjAxMS0xMi0yOCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGQgZG9tYWluLnBuZyB0byBXZWJDb3JlLmd5 cGkgLyBXZWJLaXQucXJjLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzCmluZGV4IDUyYWJiYWY4MDA1NDE2OTM2YmUwMTU3 YjZkZTU4OWVjZWU5NGViOGUuLmM2ZTM2YTk1MzhiODkwNzZkYmExNzExZjcwZWYyYTk4MjhkOWM1 YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c05hdmlnYXRvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdHNOYXZpZ2F0b3IuanMKQEAgLTk3LDkgKzk3LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNO YXZpZ2F0b3IucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5fc2NyaXB0VHJlZUVsZW1l bnRzQnlVSVNvdXJjZUNvZGUuZ2V0KHVpU291cmNlQ29kZSkpCiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIAotICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGhhdmUgYSBzZXBhcmF0ZSBz ZWN0aW9uIGZvciBhbm9ueW1vdXMgc2NyaXB0cy4KLSAgICAgICAgCi0gICAgICAgIHZhciBzY3Jp cHRUaXRsZSA9IHVpU291cmNlQ29kZS5kaXNwbGF5TmFtZTsKKyAgICAgICAgdmFyIHNjcmlwdFRp dGxlID0gdWlTb3VyY2VDb2RlLmZpbGVOYW1lIHx8IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKHBy b2dyYW0pIik7CiAgICAgICAgIHZhciBzY3JpcHRUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0 b3IuTmF2aWdhdG9yU2NyaXB0VHJlZUVsZW1lbnQodGhpcywgdWlTb3VyY2VDb2RlLCBzY3JpcHRU aXRsZSk7CiAgICAgICAgIHRoaXMuX3NjcmlwdFRyZWVFbGVtZW50c0J5VUlTb3VyY2VDb2RlLnB1 dCh1aVNvdXJjZUNvZGUsIHNjcmlwdFRyZWVFbGVtZW50KTsKICAgICAgICAgCkBAIC0xMzUsMTEg KzEzMyw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlwZSA9IHsKICAg ICAgKi8KICAgICBzZXRTY3JpcHRTb3VyY2VJc0RpcnR5OiBmdW5jdGlvbih1aVNvdXJjZUNvZGUs IGlzRGlydHkpCiAgICAgewotICAgICAgICB2YXIgc2NyaXB0VHJlZUVsZW1lbnQgPSB0aGlzLl9z Y3JpcHRUcmVlRWxlbWVudHNCeVVJU291cmNlQ29kZS5nZXQodWlTb3VyY2VDb2RlKTsKLSAgICAg ICAgdmFyIHRpdGxlID0gdWlTb3VyY2VDb2RlLmRpc3BsYXlOYW1lOwotICAgICAgICBpZiAoaXNE aXJ0eSkKLSAgICAgICAgICAgIHRpdGxlICs9ICIqIjsKLSAgICAgICAgc2NyaXB0VHJlZUVsZW1l bnQudGl0bGVUZXh0ID0gdGl0bGU7CisgICAgICAgIC8vIERvIG5vdGhpbmcuCiAgICAgfSwKIAog ICAgIC8qKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Njcmlw dHNQYW5lbC5qcwppbmRleCAyZmViOTczYjc1MmUzNTZjOTllMjViNGQ5Y2MwOTE0NDI2ODhlZjgw Li41YmFhZThmNzA2YzFlN2NjYzE4OTMwYzBlMjI4YmZlNWNkZTY2MTE1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtNDc4 LDcgKzQ3OCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAg IHsKICAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc291cmNlRnJhbWVzQnlVSVNvdXJj ZUNvZGUuZ2V0KHVpU291cmNlQ29kZSkgfHwgdGhpcy5fY3JlYXRlU291cmNlRnJhbWUodWlTb3Vy Y2VDb2RlKTsKIAotICAgICAgICB0aGlzLl9lZGl0b3JDb250YWluZXIuc2hvd1NvdXJjZUZyYW1l KHVpU291cmNlQ29kZS5kaXNwbGF5TmFtZSwgc291cmNlRnJhbWUpOworICAgICAgICB0aGlzLl9l ZGl0b3JDb250YWluZXIuc2hvd1NvdXJjZUZyYW1lKHVpU291cmNlQ29kZS5kaXNwbGF5TmFtZSwg c291cmNlRnJhbWUsIHVpU291cmNlQ29kZS51cmwpOwogICAgICAgICB0aGlzLl91cGRhdGVTY3Jp cHRWaWV3U3RhdHVzQmFySXRlbXMoKTsKIAogICAgICAgICBpZiAodWlTb3VyY2VDb2RlLnVybCkK QEAgLTU3OSw3ICs1NzksNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIGlmIChzaG91bGRSZXBsYWNlKSB7CiAgICAgICAgICAgICAgICAgdmFy IG5ld1VJU291cmNlQ29kZSA9IHVpU291cmNlQ29kZUxpc3RbMF07CiAgICAgICAgICAgICAgICAg dmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc291cmNlRnJhbWVzQnlVSVNvdXJjZUNvZGUuZ2V0KG5l d1VJU291cmNlQ29kZSkgfHwgdGhpcy5fY3JlYXRlU291cmNlRnJhbWUobmV3VUlTb3VyY2VDb2Rl KTsKLSAgICAgICAgICAgICAgICB0aGlzLl9lZGl0b3JDb250YWluZXIucmVwbGFjZVNvdXJjZUZy YW1lcyhzb3VyY2VGcmFtZXMsIG5ld1VJU291cmNlQ29kZS5kaXNwbGF5TmFtZSwgc291cmNlRnJh bWUpOworICAgICAgICAgICAgICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lci5yZXBsYWNlU291cmNl RnJhbWVzKHNvdXJjZUZyYW1lcywgbmV3VUlTb3VyY2VDb2RlLmRpc3BsYXlOYW1lLCBzb3VyY2VG cmFtZSwgbmV3VUlTb3VyY2VDb2RlLnVybCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICB9LApAQCAtMTA4OCw4ICsxMDg4LDkgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5FZGl0 b3JDb250YWluZXIucHJvdG90eXBlID0gewogICAgIC8qKgogICAgICAqIEBwYXJhbSB7c3RyaW5n fSB0aXRsZQogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lfSBzb3VyY2VG cmFtZQorICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0b29sdGlwCiAgICAgICovCi0gICAgc2hvd1Nv dXJjZUZyYW1lOiBmdW5jdGlvbih0aXRsZSwgc291cmNlRnJhbWUpIHsgfSwKKyAgICBzaG93U291 cmNlRnJhbWU6IGZ1bmN0aW9uKHRpdGxlLCBzb3VyY2VGcmFtZSwgdG9vbHRpcCkgeyB9LAogCiAg ICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU291cmNlRnJhbWV9IHNvdXJjZUZy YW1lCkBAIC0xMTAxLDggKzExMDIsOSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkVkaXRv ckNvbnRhaW5lci5wcm90b3R5cGUgPSB7CiAgICAgICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lPn0gb2xkU291cmNlRnJhbWVzCiAgICAgICogQHBhcmFtIHtzdHJpbmd9 IHRpdGxlCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU291cmNlRnJhbWV9IHNvdXJjZUZy YW1lCisgICAgICogQHBhcmFtIHtzdHJpbmd9IHRvb2x0aXAKICAgICAgKi8KLSAgICByZXBsYWNl U291cmNlRnJhbWVzOiBmdW5jdGlvbihvbGRTb3VyY2VGcmFtZXMsIHRpdGxlLCBzb3VyY2VGcmFt ZSkgeyB9LAorICAgIHJlcGxhY2VTb3VyY2VGcmFtZXM6IGZ1bmN0aW9uKG9sZFNvdXJjZUZyYW1l cywgdGl0bGUsIHNvdXJjZUZyYW1lLCB0b29sdGlwKSB7IH0sCiAKICAgICAvKioKICAgICAgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZX0gc291cmNlRnJhbWUKQEAgLTE0OTIsOCAr MTQ5NCw5IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuU2luZ2xlRmlsZUVkaXRvckNvbnRh aW5lci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IHRpdGxl CiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU291cmNlRnJhbWV9IHNvdXJjZUZyYW1lCisg ICAgICogQHBhcmFtIHtzdHJpbmd9IHRvb2x0aXAKICAgICAgKi8KLSAgICBzaG93U291cmNlRnJh bWU6IGZ1bmN0aW9uKHRpdGxlLCBzb3VyY2VGcmFtZSkKKyAgICBzaG93U291cmNlRnJhbWU6IGZ1 bmN0aW9uKHRpdGxlLCBzb3VyY2VGcmFtZSwgdG9vbHRpcCkKICAgICB7CiAgICAgICAgIGlmICh0 aGlzLl9jdXJyZW50U291cmNlRnJhbWUgPT09IHNvdXJjZUZyYW1lKQogICAgICAgICAgICAgcmV0 dXJuOwpAQCAtMTUyMCw4ICsxNTIzLDkgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5TaW5n bGVGaWxlRWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZSA9IHsKICAgICAgKiBAcGFyYW0ge0FycmF5 LjxXZWJJbnNwZWN0b3IuU291cmNlRnJhbWU+fSBvbGRTb3VyY2VGcmFtZXMKICAgICAgKiBAcGFy YW0ge3N0cmluZ30gdGl0bGUKICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZX0gc291cmNlRnJhbWUKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gdG9vbHRpcAogICAgICAqLwot ICAgIHJlcGxhY2VTb3VyY2VGcmFtZXM6IGZ1bmN0aW9uKG9sZFNvdXJjZUZyYW1lcywgdGl0bGUs IHNvdXJjZUZyYW1lKQorICAgIHJlcGxhY2VTb3VyY2VGcmFtZXM6IGZ1bmN0aW9uKG9sZFNvdXJj ZUZyYW1lcywgdGl0bGUsIHNvdXJjZUZyYW1lLCB0b29sdGlwKQogICAgIHsKICAgICAgICAgdGhp cy5fY3VycmVudFNvdXJjZUZyYW1lLmRldGFjaCgpOwogICAgICAgICB0aGlzLl9jdXJyZW50U291 cmNlRnJhbWUgPSBudWxsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UYWJiZWRFZGl0b3JDb250YWluZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcwppbmRleCA0NzE4Yjg0ODI5MmRj ZDMwZGMyZDA5OGFlN2E5MTk0YzQyYWY5NjQ5Li40ODY0NTNhNGE2MWVjMmM4NmNlNTQ2ODA5MTcw MDE5M2E4OWMwOWY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcwpAQCAtMzksNiArMzksNyBAQCBX ZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyID0gZnVuY3Rpb24oKQogICAgIHRoaXMu X3RhYmJlZFBhbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5FdmVu dFR5cGVzLlRhYkNsb3NlZCwgdGhpcy5fdGFiQ2xvc2VkLCB0aGlzKTsKIAogICAgIHRoaXMuX3Rp dGxlcyA9IG5ldyBNYXAoKTsKKyAgICB0aGlzLl90b29sdGlwcyA9IG5ldyBNYXAoKTsKICAgICB0 aGlzLl90YWJJZHMgPSBuZXcgTWFwKCk7ICAKIH0KIApAQCAtNjQsMjQgKzY1LDI3IEBAIFdlYklu c3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIucHJvdG90eXBlID0gewogICAgIC8qKgogICAg ICAqIEBwYXJhbSB7c3RyaW5nfSB0aXRsZQogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lfSBzb3VyY2VGcmFtZQorICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0b29sdGlwCiAg ICAgICovCi0gICAgc2hvd1NvdXJjZUZyYW1lOiBmdW5jdGlvbih0aXRsZSwgc291cmNlRnJhbWUp CisgICAgc2hvd1NvdXJjZUZyYW1lOiBmdW5jdGlvbih0aXRsZSwgc291cmNlRnJhbWUsIHRvb2x0 aXApCiAgICAgewotICAgICAgICB2YXIgdGFiSWQgPSB0aGlzLl90YWJJZHMuZ2V0KHNvdXJjZUZy YW1lKSB8fCB0aGlzLl9hcHBlbmRTb3VyY2VGcmFtZVRhYih0aXRsZSwgc291cmNlRnJhbWUpOwor ICAgICAgICB2YXIgdGFiSWQgPSB0aGlzLl90YWJJZHMuZ2V0KHNvdXJjZUZyYW1lKSB8fCB0aGlz Ll9hcHBlbmRTb3VyY2VGcmFtZVRhYih0aXRsZSwgc291cmNlRnJhbWUsIHRvb2x0aXApOwogICAg ICAgICB0aGlzLl90YWJiZWRQYW5lLnNlbGVjdFRhYih0YWJJZCk7CiAgICAgfSwKIAogICAgIC8q KgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0aXRsZQogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lfSBzb3VyY2VGcmFtZQorICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0b29s dGlwCiAgICAgICovCi0gICAgX2FwcGVuZFNvdXJjZUZyYW1lVGFiOiBmdW5jdGlvbih0aXRsZSwg c291cmNlRnJhbWUpCisgICAgX2FwcGVuZFNvdXJjZUZyYW1lVGFiOiBmdW5jdGlvbih0aXRsZSwg c291cmNlRnJhbWUsIHRvb2x0aXApCiAgICAgewogICAgICAgICB2YXIgdGFiSWQgPSB0aGlzLl9n ZW5lcmF0ZVRhYklkKCk7CiAgICAgICAgIHRoaXMuX3RhYklkcy5wdXQoc291cmNlRnJhbWUsIHRh YklkKQogICAgICAgICB0aGlzLl90aXRsZXMucHV0KHNvdXJjZUZyYW1lLCB0aXRsZSkKKyAgICAg ICAgdGhpcy5fdG9vbHRpcHMucHV0KHNvdXJjZUZyYW1lLCB0b29sdGlwKQogICAgICAgICAKLSAg ICAgICAgdGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRUYWIodGFiSWQsIHRpdGxlLCBzb3VyY2VGcmFt ZSk7CisgICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFiKHRhYklkLCB0aXRsZSwgc291 cmNlRnJhbWUsIHRvb2x0aXApOwogICAgICAgICByZXR1cm4gdGFiSWQ7CiAgICAgfSwKIApAQCAt MTA0LDI1ICsxMDgsMzEgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lci5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVj dG9yLlVJU291cmNlQ29kZX0gKi8gZXZlbnQuZGF0YS52aWV3OwogICAgICAgICB0aGlzLl90YWJJ ZHMucmVtb3ZlKHNvdXJjZUZyYW1lKTsKICAgICAgICAgdGhpcy5fdGl0bGVzLnJlbW92ZShzb3Vy Y2VGcmFtZSk7CisgICAgICAgIHRoaXMuX3Rvb2x0aXBzLnJlbW92ZShzb3VyY2VGcmFtZSk7CiAg ICAgfSwKIAogICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l fSBvbGRTb3VyY2VGcmFtZQogICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0aXRsZQogICAgICAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lfSBzb3VyY2VGcmFtZQorICAgICAqIEBwYXJh bSB7c3RyaW5nfSB0b29sdGlwCiAgICAgICovCi0gICAgX3JlcGxhY2VTb3VyY2VGcmFtZVRhYjog ZnVuY3Rpb24ob2xkU291cmNlRnJhbWUsIHRpdGxlLCBzb3VyY2VGcmFtZSkKKyAgICBfcmVwbGFj ZVNvdXJjZUZyYW1lVGFiOiBmdW5jdGlvbihvbGRTb3VyY2VGcmFtZSwgdGl0bGUsIHNvdXJjZUZy YW1lLCB0b29sdGlwKQogICAgIHsKICAgICAgICAgdmFyIHRhYklkID0gdGhpcy5fdGFiSWRzLmdl dChvbGRTb3VyY2VGcmFtZSk7CiAgICAgICAgIAogICAgICAgICBpZiAodGFiSWQpIHsKICAgICAg ICAgICAgIHRoaXMuX3RhYklkcy5yZW1vdmUob2xkU291cmNlRnJhbWUpOwogICAgICAgICAgICAg dGhpcy5fdGl0bGVzLnJlbW92ZShvbGRTb3VyY2VGcmFtZSk7CisgICAgICAgICAgICB0aGlzLl90 b29sdGlwcy5yZW1vdmUob2xkU291cmNlRnJhbWUpOwogCiAgICAgICAgICAgICB0aGlzLl90YWJJ ZHMucHV0KHNvdXJjZUZyYW1lLCB0YWJJZCk7CiAgICAgICAgICAgICB0aGlzLl90aXRsZXMucHV0 KHNvdXJjZUZyYW1lLCB0aXRsZSk7CisgICAgICAgICAgICB0aGlzLl90b29sdGlwcy5wdXQoc291 cmNlRnJhbWUsIHRvb2x0aXApOwogCiAgICAgICAgICAgICB0aGlzLl90YWJiZWRQYW5lLmNoYW5n ZVRhYlRpdGxlKHRhYklkLCB0aXRsZSk7CiAgICAgICAgICAgICB0aGlzLl90YWJiZWRQYW5lLmNo YW5nZVRhYlZpZXcodGFiSWQsIHNvdXJjZUZyYW1lKTsKKyAgICAgICAgICAgIHRoaXMuX3RhYmJl ZFBhbmUuY2hhbmdlVGFiVG9vbHRpcCh0YWJJZCwgdG9vbHRpcCk7CiAgICAgICAgIH0KICAgICB9 LAogCkBAIC0xMzksOCArMTQ5LDkgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5l ci5wcm90b3R5cGUgPSB7CiAgICAgICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lPn0gb2xkU291cmNlRnJhbWVzCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IHRpdGxlCiAg ICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU291cmNlRnJhbWV9IHNvdXJjZUZyYW1lCisgICAg ICogQHBhcmFtIHtzdHJpbmd9IHRvb2x0aXAKICAgICAgKi8KLSAgICByZXBsYWNlU291cmNlRnJh bWVzOiBmdW5jdGlvbihvbGRTb3VyY2VGcmFtZXMsIHRpdGxlLCBzb3VyY2VGcmFtZSkKKyAgICBy ZXBsYWNlU291cmNlRnJhbWVzOiBmdW5jdGlvbihvbGRTb3VyY2VGcmFtZXMsIHRpdGxlLCBzb3Vy Y2VGcmFtZSwgdG9vbHRpcCkKICAgICB7CiAgICAgICAgIHZhciBtYWluU291cmNlRnJhbWU7CiAg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgb2xkU291cmNlRnJhbWVzLmxlbmd0aDsgKytpKSB7 CkBAIC0xNTIsNyArMTYzLDcgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lci5w cm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIGlmIChtYWluU291cmNl RnJhbWUpCi0gICAgICAgICAgICB0aGlzLl9yZXBsYWNlU291cmNlRnJhbWVUYWIobWFpblNvdXJj ZUZyYW1lLCB0aXRsZSwgc291cmNlRnJhbWUpOworICAgICAgICAgICAgdGhpcy5fcmVwbGFjZVNv dXJjZUZyYW1lVGFiKG1haW5Tb3VyY2VGcmFtZSwgdGl0bGUsIHNvdXJjZUZyYW1lLCB0b29sdGlw KTsKICAgICAgICAgCiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgb2xkU291cmNlRnJhbWVz Lmxlbmd0aDsgKytpKQogICAgICAgICAgICAgdGhpcy5fcmVtb3ZlU291cmNlRnJhbWVUYWIob2xk U291cmNlRnJhbWVzW2ldKTsKQEAgLTE3Nyw2ICsxODgsNyBAQCBXZWJJbnNwZWN0b3IuVGFiYmVk RWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMuX3RhYmJl ZFBhbmUuY2xvc2VBbGxUYWJzKCk7CiAgICAgICAgIHRoaXMuX3RpdGxlcyA9IG5ldyBNYXAoKTsK KyAgICAgICAgdGhpcy5fdG9vbHRpcHMgPSBuZXcgTWFwKCk7CiAgICAgICAgIHRoaXMuX3RhYklk cyA9IG5ldyBNYXAoKTsgIAogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qcwppbmRleCBhNzEzMWNmODE0NTMwNTkwMDA5ZTdmMGEz ZTYzZGRiMGM4YmE5NmFjLi45YjU5Y2ZjZWU2Y2NiMTlkMjIyYTMyMjBjMjJmZDA1ZTAyNmM2NTA5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBh bmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5l LmpzCkBAIC05MCwxMCArOTAsMTEgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBl ID0gewogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBpZAogICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0 YWJUaXRsZQogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlZpZXd9IHZpZXcKKyAgICAgKiBA cGFyYW0ge3N0cmluZz19IHRhYlRvb2x0aXAKICAgICAgKi8KLSAgICBhcHBlbmRUYWI6IGZ1bmN0 aW9uKGlkLCB0YWJUaXRsZSwgdmlldykKKyAgICBhcHBlbmRUYWI6IGZ1bmN0aW9uKGlkLCB0YWJU aXRsZSwgdmlldywgdGFiVG9vbHRpcCkKICAgICB7Ci0gICAgICAgIHZhciB0YWIgPSBuZXcgV2Vi SW5zcGVjdG9yLlRhYmJlZFBhbmVUYWIodGhpcywgdGhpcy5fdGFic0VsZW1lbnQsIGlkLCB0YWJU aXRsZSwgdGhpcy5fY2xvc2VhYmxlVGFicywgdmlldyk7CisgICAgICAgIHZhciB0YWIgPSBuZXcg V2ViSW5zcGVjdG9yLlRhYmJlZFBhbmVUYWIodGhpcywgdGhpcy5fdGFic0VsZW1lbnQsIGlkLCB0 YWJUaXRsZSwgdGhpcy5fY2xvc2VhYmxlVGFicywgdmlldywgdGFiVG9vbHRpcCk7CiAKICAgICAg ICAgdGhpcy5fdGFicy5wdXNoKHRhYik7CiAgICAgICAgIHRoaXMuX3RhYnNCeUlkW2lkXSA9IHRh YjsKQEAgLTE4Niw2ICsxODcsMTYgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBl ID0gewogICAgICAgICAgICAgdGFiLnZpZXcgPSB2aWV3OwogICAgIH0sCiAKKyAgICAvKioKKyAg ICAgKiBAcGFyYW0ge3N0cmluZ30gaWQKKyAgICAgKiBAcGFyYW0ge3N0cmluZz19IHRhYlRvb2x0 aXAKKyAgICAgKi8KKyAgICBjaGFuZ2VUYWJUb29sdGlwOiBmdW5jdGlvbihpZCwgdGFiVG9vbHRp cCkKKyAgICB7CisgICAgICAgIHZhciB0YWIgPSB0aGlzLl90YWJzQnlJZFtpZF07CisgICAgICAg IHRhYi50b29sdGlwID0gdGFiVG9vbHRpcDsKKyAgICB9LAorCiAgICAgb25SZXNpemU6IGZ1bmN0 aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVRhYkVsZW1lbnRzKCk7CkBAIC00MjAs MTQgKzQzMSwxNiBAQCBXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90b3R5cGUuX19wcm90b19f ID0gV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlOwogICogQHBhcmFtIHtzdHJpbmd9IHRpdGxl CiAgKiBAcGFyYW0ge2Jvb2xlYW59IGNsb3NlYWJsZQogICogQHBhcmFtIHtXZWJJbnNwZWN0b3Iu Vmlld30gdmlldworICogQHBhcmFtIHtzdHJpbmc9fSB0b29sdGlwCiAgKi8KLVdlYkluc3BlY3Rv ci5UYWJiZWRQYW5lVGFiID0gZnVuY3Rpb24odGFiYmVkUGFuZSwgbWVhc3VyZUVsZW1lbnQsIGlk LCB0aXRsZSwgY2xvc2VhYmxlLCB2aWV3KQorV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmVUYWIgPSBm dW5jdGlvbih0YWJiZWRQYW5lLCBtZWFzdXJlRWxlbWVudCwgaWQsIHRpdGxlLCBjbG9zZWFibGUs IHZpZXcsIHRvb2x0aXApCiB7CiAgICAgdGhpcy5fY2xvc2VhYmxlID0gY2xvc2VhYmxlOwogICAg IHRoaXMuX3RhYmJlZFBhbmUgPSB0YWJiZWRQYW5lOwogICAgIHRoaXMuX21lYXN1cmVFbGVtZW50 ID0gbWVhc3VyZUVsZW1lbnQ7CiAgICAgdGhpcy5faWQgPSBpZDsKICAgICB0aGlzLl90aXRsZSA9 IHRpdGxlOworICAgIHRoaXMuX3Rvb2x0aXAgPSB0b29sdGlwOwogICAgIHRoaXMuX3ZpZXcgPSB2 aWV3OwogICAgIHRoaXMuc2hvd24gPSBmYWxzZTsKIH0KQEAgLTQ3MSw2ICs0ODQsMjEgQEAgV2Vi SW5zcGVjdG9yLlRhYmJlZFBhbmVUYWIucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioK KyAgICAgKiBAdHlwZSB7c3RyaW5nPX0KKyAgICAgKi8KKyAgICBnZXQgdG9vbHRpcCgpCisgICAg eworICAgICAgICByZXR1cm4gdGhpcy5fdG9vbHRpcDsKKyAgICB9LAorCisgICAgc2V0IHRvb2x0 aXAodG9vbHRpcCkKKyAgICB7CisgICAgICAgIHRoaXMuX3Rvb2x0aXAgPSB0b29sdGlwOworICAg ICAgICBpZiAodGhpcy5fdGl0bGVFbGVtZW50KQorICAgICAgICAgICAgdGhpcy5fdGl0bGVFbGVt ZW50LnRpdGxlID0gdG9vbHRpcCB8fCAiIjsKKyAgICB9LAorCisgICAgLyoqCiAgICAgICogQHR5 cGUge0VsZW1lbnR9CiAgICAgICovCiAgICAgZ2V0IHRhYkVsZW1lbnQoKQpAQCAtNTE4LDYgKzU0 Niw3IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiLnByb3RvdHlwZSA9IHsKICAgICAgICAg CiAgICAgICAgIHZhciB0aXRsZUVsZW1lbnQgPSB0YWJFbGVtZW50LmNyZWF0ZUNoaWxkKCJzcGFu IiwgInRhYmJlZC1wYW5lLWhlYWRlci10YWItdGl0bGUiKTsKICAgICAgICAgdGl0bGVFbGVtZW50 LnRleHRDb250ZW50ID0gdGhpcy50aXRsZTsKKyAgICAgICAgdGl0bGVFbGVtZW50LnRpdGxlID0g dGhpcy50b29sdGlwIHx8ICIiOwogICAgICAgICBpZiAoIW1lYXN1cmluZykKICAgICAgICAgICAg IHRoaXMuX3RpdGxlRWxlbWVudCA9IHRpdGxlRWxlbWVudDsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcwppbmRleCBhNjk4M2I2ZDVi ODE4OTBjMjk5NTE0YmIzMzQ4ODM2NGNkNTI4MWI4Li41YmFmZmJmODlhYWUzYTQwYmY4ZGIwYmNh Y2QxZTUxM2I4ZTZhYTkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1VJU291cmNlQ29kZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1VJU291cmNlQ29kZS5qcwpAQCAtMTc3LDExICsxNzcsMjEgQEAgV2ViSW5zcGVjdG9y LlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBmaWxlTmFtZSA9IGZpbGVO YW1lLnN1YnN0cmluZyhmcm9tSW5kZXggKyAxKTsKICAgICAgICAgfQogCi0gICAgICAgIHZhciBk aXNwbGF5TmFtZSA9IGZpbGVOYW1lOworICAgICAgICB2YXIgaW5kZXhPZlF1ZXJ5ID0gZmlsZU5h bWUuaW5kZXhPZigiPyIpOworICAgICAgICBpZiAoaW5kZXhPZlF1ZXJ5ID09PSAtMSkKKyAgICAg ICAgICAgIGluZGV4T2ZRdWVyeSA9IGZpbGVOYW1lLmxlbmd0aDsKKyAgICAgICAgdmFyIGxhc3RQ YXRoQ29tcG9uZW50ID0gZmlsZU5hbWUuc3Vic3RyaW5nKDAsIGluZGV4T2ZRdWVyeSk7CisgICAg ICAgIHZhciBxdWVyeVBhcmFtcyA9IGZpbGVOYW1lLnN1YnN0cmluZyhpbmRleE9mUXVlcnksIGZp bGVOYW1lLmxlbmd0aCk7CisgICAgICAgIAorICAgICAgICBjb25zdCBtYXhEaXNwbGF5TmFtZUxl bmd0aCA9IDMwOworICAgICAgICBjb25zdCBtaW5EaXNwbGF5UXVlcnlQYXJhbUxlbmd0aCA9IDU7 CisgICAgICAgIAorICAgICAgICB2YXIgbWF4RGlzcGxheVF1ZXJ5UGFyYW1MZW5ndGggPSBNYXRo Lm1heChtaW5EaXNwbGF5UXVlcnlQYXJhbUxlbmd0aCwgbWF4RGlzcGxheU5hbWVMZW5ndGggLSBs YXN0UGF0aENvbXBvbmVudC5sZW5ndGgpOworICAgICAgICB2YXIgZGlzcGxheVF1ZXJ5UGFyYW1z ID0gcXVlcnlQYXJhbXMudHJpbUVuZChtYXhEaXNwbGF5UXVlcnlQYXJhbUxlbmd0aCk7CisgICAg ICAgIHZhciBkaXNwbGF5TGFzdFBhdGhDb21wb25lbnQgPSBsYXN0UGF0aENvbXBvbmVudC50cmlt TWlkZGxlKG1heERpc3BsYXlOYW1lTGVuZ3RoIC0gZGlzcGxheVF1ZXJ5UGFyYW1zLmxlbmd0aCk7 CisgICAgICAgIHZhciBkaXNwbGF5TmFtZSA9IGRpc3BsYXlMYXN0UGF0aENvbXBvbmVudCArIGRp c3BsYXlRdWVyeVBhcmFtczsKICAgICAgICAgaWYgKCFkaXNwbGF5TmFtZSkKICAgICAgICAgICAg IGRpc3BsYXlOYW1lID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIocHJvZ3JhbSkiKTsKLSAgICAg ICAgZWxzZSBpZiAoZGlzcGxheU5hbWUubGVuZ3RoID4gODApCi0gICAgICAgICAgICBkaXNwbGF5 TmFtZSA9ICJcdTIwMjYiICsgZGlzcGxheU5hbWUuc3Vic3RyaW5nKGRpc3BsYXlOYW1lLmxlbmd0 aCAtIDgwKTsKIAogICAgICAgICBpZiAoZm9sZGVyTmFtZS5sZW5ndGggPiA4MCkKICAgICAgICAg ICAgIGZvbGRlck5hbWUgPSAiXHUyMDI2IiArIGZvbGRlck5hbWUuc3Vic3RyaW5nKGZvbGRlck5h bWUubGVuZ3RoIC0gODApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC91dGlsaXRpZXMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L3V0aWxpdGllcy5qcwppbmRleCBlYTdkZDNiMWM4NzA1MDA3ZDA3MDljZTM0MDY2ZGUxY2JkYzgw M2JjLi42MWJjOTI0YTQwODZjYTljODNjMzc3MGIxYzg1Njg3ZTEyNzdiMjIwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5qcwpAQCAtNTEwLDYg KzUxMCwxMyBAQCBTdHJpbmcucHJvdG90eXBlLnRyaW1NaWRkbGUgPSBmdW5jdGlvbihtYXhMZW5n dGgpCiAgICAgcmV0dXJuIHRoaXMuc3Vic3RyKDAsIGxlZnRIYWxmKSArICJcdTIwMjYiICsgdGhp cy5zdWJzdHIodGhpcy5sZW5ndGggLSByaWdodEhhbGYsIHJpZ2h0SGFsZik7CiB9CiAKK1N0cmlu Zy5wcm90b3R5cGUudHJpbUVuZCA9IGZ1bmN0aW9uKG1heExlbmd0aCkKK3sKKyAgICBpZiAodGhp cy5sZW5ndGggPD0gbWF4TGVuZ3RoKQorICAgICAgICByZXR1cm4gdGhpczsKKyAgICByZXR1cm4g dGhpcy5zdWJzdHIoMCwgbWF4TGVuZ3RoIC0gMSkgKyAiXHUyMDI2IjsKK30KKwogU3RyaW5nLnBy b3RvdHlwZS50cmltVVJMID0gZnVuY3Rpb24oYmFzZVVSTERvbWFpbikKIHsKICAgICB2YXIgcmVz dWx0ID0gdGhpcy5yZXBsYWNlKC9eKGh0dHBzfGh0dHB8ZmlsZSk6XC9cLy9pLCAiIik7CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggMWMxYmMyMjliY2M3NTBhYTkwNDVlOWRlNzU4NDQzZjVlNmQ5YmE4ZC4uZGIzMWNiZjUyOTNj Yjg1OTUxYTAxODMyNmQ0ZTNiZjdhNTRmMDZjYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEx LTEyLTI5ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFdlYiBJbnNwZWN0b3I6IFNjcmlwdHMgbmF2aWdhdG9yIHNob3VsZCB0cmltIGxvbmcgZmlsZSBu YW1lcyBhbmQgc2hvdyBmdWxsIHVybCBpbiB0b29sdGlwLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUzNDMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy LXRlc3QuanM6CisgICAgICAgIChpbml0aWFsaXplX0RlYnVnZ2VyVGVzdCk6CisgICAgICAgICog aW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0OgorICAgICAgICAq IGluc3BlY3Rvci9kZWJ1Z2dlci91aS1zb3VyY2UtY29kZS1kaXNwbGF5LW5hbWUtZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvdWktc291cmNlLWNvZGUt ZGlzcGxheS1uYW1lLmh0bWw6IEFkZGVkLgorCiAyMDExLTEyLTI4ICBBbGV4YW5kZXIgUGF2bG92 ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW50cm9k dWNlIGEgUHJvZmlsZXIgbGF1bmNoZXIgdmlldyBzaW1pbGFyIHRvIHRoYXQgaW4gdGhlIEF1ZGl0 cyBwYW5lbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVi dWdnZXItdGVzdC5qcyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy LXRlc3QuanMKaW5kZXggM2M4NjU0NTY0NzRmODg4N2RkZWIyY2QwNDM2MmM1YTI2ODg1ZWMxNC4u ZGViZjJjOGZmMGY1MzAyOWI4YzMxYzBiMTUyMmQ3MDZiNDNkMjFlNSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5qcworKysgYi9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzCkBAIC0xNTcsNyAr MTU3LDcgQEAgSW5zcGVjdG9yVGVzdC5zaG93U2NyaXB0U291cmNlID0gZnVuY3Rpb24oc2NyaXB0 TmFtZSwgY2FsbGJhY2spCiB7CiAgICAgdmFyIGZpbGVzU2VsZWN0ID0gZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoInNjcmlwdHMtZmlsZXMiKTsKICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGZpbGVz U2VsZWN0Lmxlbmd0aDsgKytpKSB7Ci0gICAgICAgIGlmIChmaWxlc1NlbGVjdFtpXS5kaXNwbGF5 TmFtZSA9PT0gc2NyaXB0TmFtZSkgeworICAgICAgICBpZiAoZmlsZXNTZWxlY3RbaV0uX3VpU291 cmNlQ29kZSAmJiBmaWxlc1NlbGVjdFtpXS5fdWlTb3VyY2VDb2RlLmZpbGVOYW1lID09PSBzY3Jp cHROYW1lKSB7CiAgICAgICAgICAgICBmaWxlc1NlbGVjdC5zZWxlY3RlZEluZGV4ID0gaTsKICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5fZmlsZVNlbGVjdG9yLl9maWxl c1NlbGVjdENoYW5nZWQoKTsKICAgICAgICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IFdlYkluc3Bl Y3Rvci5wYW5lbHMuc2NyaXB0cy52aXNpYmxlVmlldzsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVjdGVkLnR4dAppbmRleCAw ZGU3NmE3NmJkOWYzODRiMjcyMTEyNGE4NDg1YzVlMjFjODQxOTFkLi44NzM5MDcxZDcxNTIwNjVl YTg4MTM1NjUwZDI3NWUxNTUxN2RhOGYwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0CkBAIC0xNyw3ICsx Nyw3IEBAIFNvdXJjZSByZXF1ZXN0ZWQgZm9yIHNjcmlwdDMuanMKIAogUnVubmluZzogdGVzdEZp bGVzU2VsZWN0CiAgICAgP2E9Yig/YT1iKQotICAgIC4uLm9vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vbmdfdXJs KHZlcnlfbG9vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb25nX3VybCkKKyAgICB2 ZXJ5X2xvb29vb29vb28uLi5vb29vb29vb25nX3VybCh2ZXJ5X2xvb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29uZ191cmwpCiDigJQgZXhhbXBsZS5jb20g4oCUCiAgICAgP2E9Yiho dHRwOi8vZXhhbXBsZS5jb20vP2E9YikKIOKAlCBsb2NhbGhvc3Qg4oCUCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvdWktc291cmNlLWNvZGUtZGlzcGxheS1uYW1l LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci91aS1zb3VyY2Ut Y29kZS1kaXNwbGF5LW5hbWUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjYwOWIwY2NjNWNiMDkw Y2Q4NmVlOGY3YzhhZWQ1YWUxYTU4MzdiZDkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvdWktc291cmNlLWNvZGUtZGlzcGxheS1uYW1lLWV4cGVjdGVk LnR4dApAQCAtMCwwICsxLDggQEAKK1Rlc3RzIFVJU291cmNlQ29kZSBkaXNwbGF5IG5hbWUuCisK K1VJU291cmNlQ29kZSBkaXNwbGF5IG5hbWUgZm9yIHVybCAiaHR0cDovL2xvY2FsaG9zdDo4MDgw L2ZvbGRlci9maWxlbmFtZT9wYXJhbWV0ZXI9dmFsdWUmbm5uPTEiIGlzICJmaWxlbmFtZT9wYXJh bWV0ZXI9dmFsdWUmbm5uPTEiLgorVUlTb3VyY2VDb2RlIGRpc3BsYXkgbmFtZSBmb3IgdXJsICJo dHRwOi8vbG9jYWxob3N0OjgwODAvZm9sZGVyL3ZlcnktbG9uZy1maWxlbmFtZS0xMjM0NTY/bm49 MSIgaXMgInZlcnktbG9uZy1maWxlbmFtZS0xMjM0NTY/bm49MSIuCitVSVNvdXJjZUNvZGUgZGlz cGxheSBuYW1lIGZvciB1cmwgImh0dHA6Ly9sb2NhbGhvc3Q6ODA4MC9mb2xkZXIvdG9vLWxvbmct ZmlsZW5hbWUtMTIzNDU2Nzg5MD9ubj0xIiBpcyAidG9vLWxvbmctZmls4oCmZS0xMjM0NTY3ODkw P25uPTEiLgorVUlTb3VyY2VDb2RlIGRpc3BsYXkgbmFtZSBmb3IgdXJsICJodHRwOi8vbG9jYWxo b3N0OjgwODAvZm9sZGVyL2xvbmctZmlsZW5hbWU/cGFyYW1ldGVyPXZhbHVlJm5ubj0xIiBpcyAi bG9uZy1maWxlbmFtZT9wYXJhbWV0ZXI9dmFsdWXigKYiLgorVUlTb3VyY2VDb2RlIGRpc3BsYXkg bmFtZSBmb3IgdXJsICJodHRwOi8vbG9jYWxob3N0OjgwODAvZm9sZGVyL3Rvby1sb25nLWZpbGVu YW1lLTEyMzQ1Njc4OTA/cGFyYW1ldGVyPXZhbHVlJm5ubj0xIiBpcyAidG9vLWxvbmctZmls4oCm ZS0xMjM0NTY3ODkwP3BhcuKApiIuCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9kZWJ1Z2dlci91aS1zb3VyY2UtY29kZS1kaXNwbGF5LW5hbWUuaHRtbCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9kZWJ1Z2dlci91aS1zb3VyY2UtY29kZS1kaXNwbGF5LW5hbWUuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi5hMTE2MjFiNTM0YzhjMTg1MTA4YjczNjE5ZWMzY2M0ZGI0OWRhYzFlCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3VpLXNvdXJjZS1jb2Rl LWRpc3BsYXktbmFtZS5odG1sCkBAIC0wLDAgKzEsMjYgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2Ny aXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanMiPjwv c2NyaXB0PgorPHNjcmlwdD4KK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIGZ1bmN0aW9uIGR1bXBV SVNvdXJjZUNvZGVEaXNwbGF5TmFtZSh1cmwpCisgICAgeworICAgICAgICB2YXIgdWlTb3VyY2VD b2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUoImlkIiwgdXJsLCBudWxsLCBudWxs KTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlVJU291cmNlQ29kZSBkaXNwbGF5 IG5hbWUgZm9yIHVybCBcIiIgKyB1cmwgKyAiXCIgaXMgXCIiICsgdWlTb3VyY2VDb2RlLmRpc3Bs YXlOYW1lICsgIlwiLiIpOworICAgIH0KKworICAgIGNvbnN0IGJhc2VVUkwgPSAiaHR0cDovL2xv Y2FsaG9zdDo4MDgwL2ZvbGRlci8iOworICAgIGR1bXBVSVNvdXJjZUNvZGVEaXNwbGF5TmFtZShi YXNlVVJMICsgImZpbGVuYW1lP3BhcmFtZXRlcj12YWx1ZSZubm49MSIpOworICAgIGR1bXBVSVNv dXJjZUNvZGVEaXNwbGF5TmFtZShiYXNlVVJMICsgInZlcnktbG9uZy1maWxlbmFtZS0xMjM0NTY/ bm49MSIpOworICAgIGR1bXBVSVNvdXJjZUNvZGVEaXNwbGF5TmFtZShiYXNlVVJMICsgInRvby1s b25nLWZpbGVuYW1lLTEyMzQ1Njc4OTA/bm49MSIpOworICAgIGR1bXBVSVNvdXJjZUNvZGVEaXNw bGF5TmFtZShiYXNlVVJMICsgImxvbmctZmlsZW5hbWU/cGFyYW1ldGVyPXZhbHVlJm5ubj0xIik7 CisgICAgZHVtcFVJU291cmNlQ29kZURpc3BsYXlOYW1lKGJhc2VVUkwgKyAidG9vLWxvbmctZmls ZW5hbWUtMTIzNDU2Nzg5MD9wYXJhbWV0ZXI9dmFsdWUmbm5uPTEiKTsKKyAgICBJbnNwZWN0b3JU ZXN0LmNvbXBsZXRlVGVzdCgpOworfTsKKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2Fk PSJydW5UZXN0KCkiPgorPHA+VGVzdHMgVUlTb3VyY2VDb2RlIGRpc3BsYXkgbmFtZS48L3A+Cis8 L2JvZHk+Cis8L2h0bWw+Cg==