105433 2012-12-19 07:02:35 -0800 Web Inspector: Rename workspace path to uri. 2012-12-19 07:30:56 -0800 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 794636 0 vsevik 2012-12-19 07:02:35 -0800 As decided uri should be file unique id / address in workspace. Patch to follow. 794637 1 180160 vsevik 2012-12-19 07:04:03 -0800 Created attachment 180160 Patch 794654 2 vsevik 2012-12-19 07:30:56 -0800 Committed r138160: <http://trac.webkit.org/changeset/138160> 180160 2012-12-19 07:04:03 -0800 2012-12-19 07:25:55 -0800 Patch bug-105433-20121219190119.patch text/plain 10054 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGZhZmU3OGI1YzA3NjZm YzM2YjIyMmM3ODg3NTlkNjc4MjViMjNiYS4uNTRjMjIxYWM5YWFhZmZlNzJiY2M0ZWIwYjA2YWFi OGYwMmY3OWJlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTEyLTE5ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJlbmFtZSB3b3Jrc3BhY2UgcGF0aCB0byB1cmkuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU0MzMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVUkkgc2hvdWxkIGxhdGVyIGJlY29tZSBmaWxlIHVu aXF1ZSBpZCAvIGFkZHJlc3MgaW4gd29ya3NwYWNlLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9OZXR3b3JrV29ya3NwYWNlUHJvdmlkZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuTmV0d29ya1dvcmtzcGFjZVByb3ZpZGVyLnByb3RvdHlwZS5yZXF1ZXN0RmlsZUNvbnRlbnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtXb3Jrc3BhY2VQcm92aWRlci5wcm90b3R5 cGUuc2V0RmlsZUNvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtXb3Jrc3Bh Y2VQcm92aWRlci5wcm90b3R5cGUuc2VhcmNoSW5GaWxlQ29udGVudCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuTmV0d29ya1dvcmtzcGFjZVByb3ZpZGVyLnByb3RvdHlwZS5hZGRGaWxlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrV29ya3NwYWNlUHJvdmlkZXIucHJvdG90eXBlLnJl bW92ZUZpbGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvV29ya3NwYWNlLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVEZXNjcmlwdG9yKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Xb3Jrc3BhY2VQcm92aWRlci5wcm90b3R5cGUucmVxdWVzdEZpbGVDb250ZW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2VQcm92aWRlci5wcm90b3R5cGUuc2VhcmNoSW5G aWxlQ29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvamVjdC5wcm90b3R5cGUuX2Zp bGVBZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvamVjdC5wcm90b3R5cGUuX2ZpbGVS ZW1vdmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9qZWN0LnByb3RvdHlwZS5yZXF1ZXN0 RmlsZUNvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2plY3QucHJvdG90eXBlLnNl YXJjaEluRmlsZUNvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLldvcmtzcGFjZS5wcm90 b3R5cGUuYWRkVGVtcG9yYXJ5VUlTb3VyY2VDb2RlKToKKworMjAxMi0xMi0xOSAgVnNldm9sb2Qg Vmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dXBwb3J0IHJlbW92aW5nIHNldmVyYWwgdGFicyBmcm9tIFRhYmJlZEVkaXRvckNvbnRhaW5lci9U YWJiZWRQYW5lIGF0IG9uY2UuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDQ4ODEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrV29ya3NwYWNlUHJvdmlkZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtXb3Jrc3BhY2VQcm92aWRlci5qcwppbmRleCA2Njgx MmFkZmZhYjFlM2ZjMWUzYzA2NTY2ZDAzYzE1OTRjMzgwZjFkLi4wYTYwMjdjNTliZTUwZDllZWZh OWU0NzE4NjhiZGY1NjFhZWM4ZTk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05ldHdvcmtXb3Jrc3BhY2VQcm92aWRlci5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtXb3Jrc3BhY2VQcm92aWRlci5qcwpAQCAt NDEsMjEgKzQxLDIxIEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrV29ya3NwYWNlUHJvdmlkZXIgPSBm dW5jdGlvbigpCiAKIFdlYkluc3BlY3Rvci5OZXR3b3JrV29ya3NwYWNlUHJvdmlkZXIucHJvdG90 eXBlID0gewogICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwYXRoCisgICAgICogQHBh cmFtIHtzdHJpbmd9IHVyaQogICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyxib29sZWFu LHN0cmluZyl9IGNhbGxiYWNrCiAgICAgICovCi0gICAgcmVxdWVzdEZpbGVDb250ZW50OiBmdW5j dGlvbihwYXRoLCBjYWxsYmFjaykKKyAgICByZXF1ZXN0RmlsZUNvbnRlbnQ6IGZ1bmN0aW9uKHVy aSwgY2FsbGJhY2spCiAgICAgewotICAgICAgICB2YXIgY29udGVudFByb3ZpZGVyID0gdGhpcy5f Y29udGVudFByb3ZpZGVyc1twYXRoXTsKKyAgICAgICAgdmFyIGNvbnRlbnRQcm92aWRlciA9IHRo aXMuX2NvbnRlbnRQcm92aWRlcnNbdXJpXTsKICAgICAgICAgY29udGVudFByb3ZpZGVyLnJlcXVl c3RDb250ZW50KGNhbGxiYWNrKTsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtz dHJpbmd9IHBhdGgKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gdXJpCiAgICAgICogQHBhcmFtIHtz dHJpbmd9IG5ld0NvbnRlbnQKICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSBjYWxs YmFjawogICAgICAqLwotICAgIHNldEZpbGVDb250ZW50OiBmdW5jdGlvbihwYXRoLCBuZXdDb250 ZW50LCBjYWxsYmFjaykKKyAgICBzZXRGaWxlQ29udGVudDogZnVuY3Rpb24odXJpLCBuZXdDb250 ZW50LCBjYWxsYmFjaykKICAgICB7CiAgICAgICAgIGNhbGxiYWNrKG51bGwpOwogICAgIH0sCkBA IC02NiwzMyArNjYsMzMgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtXb3Jrc3BhY2VQcm92aWRlci5w cm90b3R5cGUgPSB7CiAgICAgICogQHBhcmFtIHtib29sZWFufSBpc1JlZ2V4CiAgICAgICogQHBh cmFtIHtmdW5jdGlvbihBcnJheS48V2ViSW5zcGVjdG9yLkNvbnRlbnRQcm92aWRlci5TZWFyY2hN YXRjaD4pfSBjYWxsYmFjawogICAgICAqLwotICAgIHNlYXJjaEluRmlsZUNvbnRlbnQ6IGZ1bmN0 aW9uKHBhdGgsIHF1ZXJ5LCBjYXNlU2Vuc2l0aXZlLCBpc1JlZ2V4LCBjYWxsYmFjaykKKyAgICBz ZWFyY2hJbkZpbGVDb250ZW50OiBmdW5jdGlvbih1cmksIHF1ZXJ5LCBjYXNlU2Vuc2l0aXZlLCBp c1JlZ2V4LCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIHZhciBjb250ZW50UHJvdmlkZXIgPSB0 aGlzLl9jb250ZW50UHJvdmlkZXJzW3BhdGhdOworICAgICAgICB2YXIgY29udGVudFByb3ZpZGVy ID0gdGhpcy5fY29udGVudFByb3ZpZGVyc1t1cmldOwogICAgICAgICBjb250ZW50UHJvdmlkZXIu c2VhcmNoSW5Db250ZW50KHF1ZXJ5LCBjYXNlU2Vuc2l0aXZlLCBpc1JlZ2V4LCBjYWxsYmFjayk7 CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwYXRoCisgICAgICog QHBhcmFtIHtzdHJpbmd9IHVyaQogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkNvbnRlbnRQ cm92aWRlcn0gY29udGVudFByb3ZpZGVyCiAgICAgICogQHBhcmFtIHtib29sZWFufSBpc0VkaXRh YmxlCiAgICAgICogQHBhcmFtIHtib29sZWFuPX0gaXNDb250ZW50U2NyaXB0CiAgICAgICogQHBh cmFtIHtib29sZWFuPX0gaXNTbmlwcGV0CiAgICAgICovCi0gICAgYWRkRmlsZTogZnVuY3Rpb24o cGF0aCwgY29udGVudFByb3ZpZGVyLCBpc0VkaXRhYmxlLCBpc0NvbnRlbnRTY3JpcHQsIGlzU25p cHBldCkKKyAgICBhZGRGaWxlOiBmdW5jdGlvbih1cmksIGNvbnRlbnRQcm92aWRlciwgaXNFZGl0 YWJsZSwgaXNDb250ZW50U2NyaXB0LCBpc1NuaXBwZXQpCiAgICAgewotICAgICAgICB2YXIgZmls ZURlc2NyaXB0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLkZpbGVEZXNjcmlwdG9yKHBhdGgsIGNvbnRl bnRQcm92aWRlci5jb250ZW50VHlwZSgpLCBpc0VkaXRhYmxlLCBpc0NvbnRlbnRTY3JpcHQsIGlz U25pcHBldCk7Ci0gICAgICAgIHRoaXMuX2NvbnRlbnRQcm92aWRlcnNbcGF0aF0gPSBjb250ZW50 UHJvdmlkZXI7CisgICAgICAgIHZhciBmaWxlRGVzY3JpcHRvciA9IG5ldyBXZWJJbnNwZWN0b3Iu RmlsZURlc2NyaXB0b3IodXJpLCBjb250ZW50UHJvdmlkZXIuY29udGVudFR5cGUoKSwgaXNFZGl0 YWJsZSwgaXNDb250ZW50U2NyaXB0LCBpc1NuaXBwZXQpOworICAgICAgICB0aGlzLl9jb250ZW50 UHJvdmlkZXJzW3VyaV0gPSBjb250ZW50UHJvdmlkZXI7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hF dmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2VQcm92aWRlci5FdmVudHMuRmls ZUFkZGVkLCBmaWxlRGVzY3JpcHRvcik7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJh bSB7c3RyaW5nfSBwYXRoCisgICAgICogQHBhcmFtIHtzdHJpbmd9IHVyaQogICAgICAqLwotICAg IHJlbW92ZUZpbGU6IGZ1bmN0aW9uKHBhdGgpCisgICAgcmVtb3ZlRmlsZTogZnVuY3Rpb24odXJp KQogICAgIHsKLSAgICAgICAgZGVsZXRlIHRoaXMuX2NvbnRlbnRQcm92aWRlcnNbcGF0aF07Ci0g ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Xb3Jrc3Bh Y2VQcm92aWRlci5FdmVudHMuRmlsZVJlbW92ZWQsIHBhdGgpOworICAgICAgICBkZWxldGUgdGhp cy5fY29udGVudFByb3ZpZGVyc1t1cmldOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xp c3RlbmVycyhXZWJJbnNwZWN0b3IuV29ya3NwYWNlUHJvdmlkZXIuRXZlbnRzLkZpbGVSZW1vdmVk LCB1cmkpOwogICAgIH0sCiAKICAgICByZXNldDogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2UuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtzcGFjZS5qcwppbmRleCAwOWFiZTE2YzE2MDQ0 ZTI2ZTM5NWRjNDdkOTBlYjMyNWE1MWUyNmMzLi40NjgwMWU1NzZkMGZjNWJmZGJmMWVmYTJiMDM3 YzVjNzk2Y2M3NzIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1dvcmtzcGFjZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1dvcmtzcGFjZS5qcwpAQCAtNTgsMTUgKzU4LDE1IEBAIFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2VD b250cm9sbGVyLnByb3RvdHlwZSA9IHsKIAogLyoqCiAgKiBAY29uc3RydWN0b3IKLSAqIEBwYXJh bSB7c3RyaW5nfSBwYXRoCisgKiBAcGFyYW0ge3N0cmluZ30gdXJpCiAgKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5SZXNvdXJjZVR5cGV9IGNvbnRlbnRUeXBlCiAgKiBAcGFyYW0ge2Jvb2xlYW59IGlz RWRpdGFibGUKICAqIEBwYXJhbSB7Ym9vbGVhbj19IGlzQ29udGVudFNjcmlwdAogICogQHBhcmFt IHtib29sZWFuPX0gaXNTbmlwcGV0CiAgKi8KLVdlYkluc3BlY3Rvci5GaWxlRGVzY3JpcHRvciA9 IGZ1bmN0aW9uKHBhdGgsIGNvbnRlbnRUeXBlLCBpc0VkaXRhYmxlLCBpc0NvbnRlbnRTY3JpcHQs IGlzU25pcHBldCkKK1dlYkluc3BlY3Rvci5GaWxlRGVzY3JpcHRvciA9IGZ1bmN0aW9uKHVyaSwg Y29udGVudFR5cGUsIGlzRWRpdGFibGUsIGlzQ29udGVudFNjcmlwdCwgaXNTbmlwcGV0KQogewot ICAgIHRoaXMucGF0aCA9IHBhdGg7CisgICAgdGhpcy51cmkgPSB1cmk7CiAgICAgdGhpcy5jb250 ZW50VHlwZSA9IGNvbnRlbnRUeXBlOwogICAgIHRoaXMuaXNFZGl0YWJsZSA9IGlzRWRpdGFibGU7 CiAgICAgdGhpcy5pc0NvbnRlbnRTY3JpcHQgPSBpc0NvbnRlbnRTY3JpcHQgfHwgZmFsc2U7CkBA IC04NSwxMCArODUsMTAgQEAgV2ViSW5zcGVjdG9yLldvcmtzcGFjZVByb3ZpZGVyLkV2ZW50cyA9 IHsKIAogV2ViSW5zcGVjdG9yLldvcmtzcGFjZVByb3ZpZGVyLnByb3RvdHlwZSA9IHsKICAgICAv KioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gcGF0aAorICAgICAqIEBwYXJhbSB7c3RyaW5nfSB1 cmkKICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcsYm9vbGVhbixzdHJpbmcpfSBjYWxs YmFjawogICAgICAqLwotICAgIHJlcXVlc3RGaWxlQ29udGVudDogZnVuY3Rpb24ocGF0aCwgY2Fs bGJhY2spIHsgfSwKKyAgICByZXF1ZXN0RmlsZUNvbnRlbnQ6IGZ1bmN0aW9uKHVyaSwgY2FsbGJh Y2spIHsgfSwKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBxdWVyeQpAQCAtOTYs NyArOTYsNyBAQCBXZWJJbnNwZWN0b3IuV29ya3NwYWNlUHJvdmlkZXIucHJvdG90eXBlID0gewog ICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gaXNSZWdleAogICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24o QXJyYXkuPFdlYkluc3BlY3Rvci5Db250ZW50UHJvdmlkZXIuU2VhcmNoTWF0Y2g+KX0gY2FsbGJh Y2sKICAgICAgKi8KLSAgICBzZWFyY2hJbkZpbGVDb250ZW50OiBmdW5jdGlvbihwYXRoLCBxdWVy eSwgY2FzZVNlbnNpdGl2ZSwgaXNSZWdleCwgY2FsbGJhY2spIHsgfSwKKyAgICBzZWFyY2hJbkZp bGVDb250ZW50OiBmdW5jdGlvbih1cmksIHF1ZXJ5LCBjYXNlU2Vuc2l0aXZlLCBpc1JlZ2V4LCBj YWxsYmFjaykgeyB9LAogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IGV2ZW50VHlw ZQpAQCAtMTQyLDEyICsxNDIsMTIgQEAgV2ViSW5zcGVjdG9yLlByb2plY3QucHJvdG90eXBlID0g ewogICAgIF9maWxlQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIGZp bGVEZXNjcmlwdG9yID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuRmlsZURlc2NyaXB0b3J9ICov IChldmVudC5kYXRhKTsKLSAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IHRoaXMudWlTb3VyY2VD b2RlRm9yVVJMKGZpbGVEZXNjcmlwdG9yLnBhdGgpOworICAgICAgICB2YXIgdWlTb3VyY2VDb2Rl ID0gdGhpcy51aVNvdXJjZUNvZGVGb3JVUkwoZmlsZURlc2NyaXB0b3IudXJpKTsKICAgICAgICAg aWYgKHVpU291cmNlQ29kZSkgewogICAgICAgICAgICAgLy8gRklYTUU6IEltcGxlbWVudAogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIHVpU291cmNlQ29kZSA9IG5ldyBX ZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlKHRoaXMuX3dvcmtzcGFjZSwgZmlsZURlc2NyaXB0b3Iu cGF0aCwgZmlsZURlc2NyaXB0b3IuY29udGVudFR5cGUsIGZpbGVEZXNjcmlwdG9yLmlzRWRpdGFi bGUpOworICAgICAgICB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZSh0aGlzLl93b3Jrc3BhY2UsIGZpbGVEZXNjcmlwdG9yLnVyaSwgZmlsZURlc2NyaXB0b3IuY29u dGVudFR5cGUsIGZpbGVEZXNjcmlwdG9yLmlzRWRpdGFibGUpOwogICAgICAgICB1aVNvdXJjZUNv ZGUuaXNDb250ZW50U2NyaXB0ID0gZmlsZURlc2NyaXB0b3IuaXNDb250ZW50U2NyaXB0OwogICAg ICAgICB1aVNvdXJjZUNvZGUuaXNTbmlwcGV0ID0gZmlsZURlc2NyaXB0b3IuaXNTbmlwcGV0Owog ICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGVzLnB1c2godWlTb3VyY2VDb2RlKTsKQEAgLTE1Niw4 ICsxNTYsOCBAQCBXZWJJbnNwZWN0b3IuUHJvamVjdC5wcm90b3R5cGUgPSB7CiAKICAgICBfZmls ZVJlbW92ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIHBhdGggPSAvKiog QHR5cGUge3N0cmluZ30gKi8gKGV2ZW50LmRhdGEpOwotICAgICAgICB2YXIgdWlTb3VyY2VDb2Rl ID0gdGhpcy51aVNvdXJjZUNvZGVGb3JVUkwocGF0aCk7CisgICAgICAgIHZhciB1cmkgPSAvKiog QHR5cGUge3N0cmluZ30gKi8gKGV2ZW50LmRhdGEpOworICAgICAgICB2YXIgdWlTb3VyY2VDb2Rl ID0gdGhpcy51aVNvdXJjZUNvZGVGb3JVUkwodXJpKTsKICAgICAgICAgaWYgKCF1aVNvdXJjZUNv ZGUpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZXMuc3Bs aWNlKHRoaXMuX3VpU291cmNlQ29kZXMuaW5kZXhPZih1aVNvdXJjZUNvZGUpLCAxKTsKQEAgLTE4 NiwxMiArMTg2LDEyIEBAIFdlYkluc3BlY3Rvci5Qcm9qZWN0LnByb3RvdHlwZSA9IHsKICAgICB9 LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtzdHJpbmd9IHBhdGgKKyAgICAgKiBAcGFyYW0g e3N0cmluZ30gdXJpCiAgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nLGJvb2xlYW4sc3Ry aW5nKX0gY2FsbGJhY2sKICAgICAgKi8KLSAgICByZXF1ZXN0RmlsZUNvbnRlbnQ6IGZ1bmN0aW9u KHBhdGgsIGNhbGxiYWNrKQorICAgIHJlcXVlc3RGaWxlQ29udGVudDogZnVuY3Rpb24odXJpLCBj YWxsYmFjaykKICAgICB7Ci0gICAgICAgIHRoaXMuX3dvcmtzcGFjZVByb3ZpZGVyLnJlcXVlc3RG aWxlQ29udGVudChwYXRoLCBjYWxsYmFjayk7CisgICAgICAgIHRoaXMuX3dvcmtzcGFjZVByb3Zp ZGVyLnJlcXVlc3RGaWxlQ29udGVudCh1cmksIGNhbGxiYWNrKTsKICAgICB9LAogCiAgICAgLyoq CkBAIC0yMDAsOSArMjAwLDkgQEAgV2ViSW5zcGVjdG9yLlByb2plY3QucHJvdG90eXBlID0gewog ICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gaXNSZWdleAogICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24o QXJyYXkuPFdlYkluc3BlY3Rvci5Db250ZW50UHJvdmlkZXIuU2VhcmNoTWF0Y2g+KX0gY2FsbGJh Y2sKICAgICAgKi8KLSAgICBzZWFyY2hJbkZpbGVDb250ZW50OiBmdW5jdGlvbihwYXRoLCBxdWVy eSwgY2FzZVNlbnNpdGl2ZSwgaXNSZWdleCwgY2FsbGJhY2spCisgICAgc2VhcmNoSW5GaWxlQ29u dGVudDogZnVuY3Rpb24odXJpLCBxdWVyeSwgY2FzZVNlbnNpdGl2ZSwgaXNSZWdleCwgY2FsbGJh Y2spCiAgICAgewotICAgICAgICB0aGlzLl93b3Jrc3BhY2VQcm92aWRlci5zZWFyY2hJbkZpbGVD b250ZW50KHBhdGgsIHF1ZXJ5LCBjYXNlU2Vuc2l0aXZlLCBpc1JlZ2V4LCBjYWxsYmFjayk7Cisg ICAgICAgIHRoaXMuX3dvcmtzcGFjZVByb3ZpZGVyLnNlYXJjaEluRmlsZUNvbnRlbnQodXJpLCBx dWVyeSwgY2FzZVNlbnNpdGl2ZSwgaXNSZWdleCwgY2FsbGJhY2spOwogICAgIH0KIH0KIApAQCAt MjYwLDE1ICsyNjAsMTUgQEAgV2ViSW5zcGVjdG9yLldvcmtzcGFjZS5wcm90b3R5cGUgPSB7CiAg ICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwYXRoCisgICAgICogQHBh cmFtIHtzdHJpbmd9IHVyaQogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkNvbnRlbnRQcm92 aWRlcn0gY29udGVudFByb3ZpZGVyCiAgICAgICogQHBhcmFtIHtib29sZWFufSBpc0VkaXRhYmxl CiAgICAgICogQHBhcmFtIHtib29sZWFuPX0gaXNDb250ZW50U2NyaXB0CiAgICAgICogQHBhcmFt IHtib29sZWFuPX0gaXNTbmlwcGV0CiAgICAgICovCi0gICAgYWRkVGVtcG9yYXJ5VUlTb3VyY2VD b2RlOiBmdW5jdGlvbihwYXRoLCBjb250ZW50UHJvdmlkZXIsIGlzRWRpdGFibGUsIGlzQ29udGVu dFNjcmlwdCwgaXNTbmlwcGV0KQorICAgIGFkZFRlbXBvcmFyeVVJU291cmNlQ29kZTogZnVuY3Rp b24odXJpLCBjb250ZW50UHJvdmlkZXIsIGlzRWRpdGFibGUsIGlzQ29udGVudFNjcmlwdCwgaXNT bmlwcGV0KQogICAgIHsKLSAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlKHRoaXMsIHBhdGgsIGNvbnRlbnRQcm92aWRlci5jb250ZW50VHlwZSgp LCBpc0VkaXRhYmxlKTsKKyAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlKHRoaXMsIHVyaSwgY29udGVudFByb3ZpZGVyLmNvbnRlbnRUeXBlKCks IGlzRWRpdGFibGUpOwogICAgICAgICB0aGlzLl90ZW1wb3JhcnlDb250ZW50UHJvdmlkZXJzLnB1 dCh1aVNvdXJjZUNvZGUsIGNvbnRlbnRQcm92aWRlcik7CiAgICAgICAgIHVpU291cmNlQ29kZS5p c0NvbnRlbnRTY3JpcHQgPSBpc0NvbnRlbnRTY3JpcHQ7CiAgICAgICAgIHVpU291cmNlQ29kZS5p c1NuaXBwZXQgPSBpc1NuaXBwZXQ7Cg==