107008 2013-01-16 06:21:03 -0800 Web Inspector: UISourceCode scriptFile / styleFile should be reset on navigation (debugger or css model reset). 2013-01-16 08:50:01 -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 808330 0 vsevik 2013-01-16 06:21:03 -0800 Patch to follow 808333 1 182971 vsevik 2013-01-16 06:25:45 -0800 Created attachment 182971 Patch 808370 2 182971 pfeldman 2013-01-16 07:39:13 -0800 Comment on attachment 182971 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182971&action=review > Source/WebCore/inspector/front-end/StylesSourceMapping.js:121 > + _frameAdded: function(event) Looks like a pattern. MainFrameCreatedOrNavigated. 808380 3 182985 vsevik 2013-01-16 08:14:58 -0800 Created attachment 182985 Patch 808400 4 vsevik 2013-01-16 08:50:01 -0800 Committed r139885: <http://trac.webkit.org/changeset/139885> 182971 2013-01-16 06:25:45 -0800 2013-01-16 08:14:53 -0800 Patch bug-107008-20130116182246.patch text/plain 13374 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5ODY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzczYjI3MDY5ZTVmNmZk ZDgxZTdmMzJjZTY0ODQ3M2NlZmZjOGYzOC4uODZhZTc5OTE3YzgzOTNlZjIyYTQxMjlhMmQ0YWNl NWQxNWI0YzRlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTAxLTE2ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFVJU291cmNlQ29kZSBzY3JpcHRGaWxlIC8gc3R5bGVGaWxlIHNob3VsZCBiZSByZXNldCBv biBuYXZpZ2F0aW9uIChkZWJ1Z2dlciBvciBjc3MgbW9kZWwgcmVzZXQpLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MDA4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2NyaXB0RmlsZXMgYW5kIHN0eWxl RmlsZXMgYXJlIG5vdyByZXNldCBhbmQgZGlzcG9zZWQgb24gVUlTb3VyY2VDb2RlcyBvbiBjb3Jy ZXNwb25kaW5nIG1vZGVscyByZXNldC4KKyAgICAgICAgU3R5bGVTb3VyY2VNYXBwaW5nIG5vdyB0 cmllcyB0byBzZXR1cCBtYXBwaW5nIGZvciBuZXdseSBhZGRlZCByZXNvdXJjZSBhcyB3ZWxsIGFz IGZvciB1aVNvdXJjZUNvZGVzIHByZXZpb3VzbHkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0NTU1N0eWxlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVN b2RlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUuX2Zy YW1lQWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBl Ll9tYWluRnJhbWVOYXZpZ2F0ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VTY3JpcHRNYXBwaW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2Ny aXB0TWFwcGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTY3JpcHRNYXBwaW5n LnByb3RvdHlwZS5fdW5iaW5kVUlTb3VyY2VDb2RlRnJvbVNjcmlwdHMpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90b3R5cGUuX2luaXRpYWxpemUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90b3R5cGUuX2Rl YnVnZ2VyUmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0RmlsZS5w cm90b3R5cGUuZGlzcG9zZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRT bmlwcGV0TW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBldE1vZGVs KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRTbmlwcGV0TW9kZWwucHJvdG90eXBlLl9k ZWJ1Z2dlclJlc2V0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NvdXJj ZU1hcHBpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU291cmNlTWFwcGluZyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU291cmNlTWFwcGluZy5wcm90b3R5cGUuX3Jl c291cmNlQWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1NvdXJjZU1hcHBpbmcu cHJvdG90eXBlLl91aVNvdXJjZUNvZGVBZGRlZFRvV29ya3NwYWNlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TdHlsZXNTb3VyY2VNYXBwaW5nLnByb3RvdHlwZS5fYmluZFVJU291cmNlQ29kZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU291cmNlTWFwcGluZy5wcm90b3R5cGUuX3By b2plY3RXaWxsUmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1NvdXJjZU1hcHBp bmcucHJvdG90eXBlLl9pbml0aWFsaXplKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNT b3VyY2VNYXBwaW5nLnByb3RvdHlwZS5fZnJhbWVBZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU3R5bGVzU291cmNlTWFwcGluZy5wcm90b3R5cGUuX21haW5GcmFtZU5hdmlnYXRlZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVGaWxlLnByb3RvdHlwZS5kaXNwb3NlKToKKwogMjAx My0wMS0xNiAgUGFibG8gRmxvdXJldCAgPHBhYmxvZkBtb3Rvcm9sYS5jb20+CiAKICAgICAgICAg SW1wbGVtZW50IENTU1N1cHBvcnRzUnVsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4IDA2Y2NkZDExNDZjOTIyNGNkNmFi YWU0MTJlZTBkN2IxMGY0MzVmOTQuLjI3N2E2NzI3MjA0MjVlZjJkNjgwMGY5NDI2OGQzYTQzNDUx MzcxNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NT U3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NT U1N0eWxlTW9kZWwuanMKQEAgLTQxLDcgKzQxLDggQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9k ZWwgPSBmdW5jdGlvbigpCiAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50LmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLkRPTUFnZW50LkV2ZW50cy5VbmRvUmVkb1JlcXVlc3RlZCwgdGhpcy5f dW5kb1JlZG9SZXF1ZXN0ZWQsIHRoaXMpOwogICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5ET01BZ2VudC5FdmVudHMuVW5kb1JlZG9Db21wbGV0 ZWQsIHRoaXMuX3VuZG9SZWRvQ29tcGxldGVkLCB0aGlzKTsKICAgICB0aGlzLl9yZXNvdXJjZUJp bmRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWxSZXNvdXJjZUJpbmRpbmcoKTsK LSAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5JbnNwZWN0ZWRVUkxDaGFuZ2Vk LCB0aGlzLl9pbnNwZWN0ZWRVUkxDaGFuZ2VkLCB0aGlzKTsKKyAgICBXZWJJbnNwZWN0b3IucmVz b3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVl TW9kZWwuRXZlbnRUeXBlcy5GcmFtZUFkZGVkLCB0aGlzLl9mcmFtZUFkZGVkLCB0aGlzKTsKKyAg ICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5NYWluRnJhbWVOYXZpZ2F0ZWQsIHRo aXMuX21haW5GcmFtZU5hdmlnYXRlZCwgdGhpcyk7CiAgICAgdGhpcy5fbmFtZWRGbG93Q29sbGVj dGlvbnMgPSB7fTsKICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuRE9NQWdlbnQuRXZlbnRzLkRvY3VtZW50VXBkYXRlZCwgdGhpcy5fcmVzZXRO YW1lZEZsb3dDb2xsZWN0aW9ucywgdGhpcyk7CiAgICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rl ckNTU0Rpc3BhdGNoZXIobmV3IFdlYkluc3BlY3Rvci5DU1NEaXNwYXRjaGVyKHRoaXMpKTsKQEAg LTU4LDcgKzU5LDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucGFyc2VSdWxlQXJyYXlQ YXlsb2FkID0gZnVuY3Rpb24ocnVsZUFycmF5KQogICAgICAgICByZXN1bHQucHVzaChXZWJJbnNw ZWN0b3IuQ1NTUnVsZS5wYXJzZVBheWxvYWQocnVsZUFycmF5W2ldKSk7CiAgICAgcmV0dXJuIHJl c3VsdDsKIH0KLQorICAgIAogLyoqCiAgKiBAcGFyYW0ge0FycmF5LjxDU1NBZ2VudC5SdWxlTWF0 Y2g+fSBtYXRjaEFycmF5CiAgKi8KQEAgLTQ3OSwxMCArNDgwLDE3IEBAIFdlYkluc3BlY3Rvci5D U1NTdHlsZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc291cmNl QmluZGluZzsKICAgICB9LAogCisgICAgX2ZyYW1lQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAg IHsKKyAgICAgICAgdmFyIGZyYW1lID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuUmVzb3VyY2VU cmVlRnJhbWV9ICovIChldmVudC5kYXRhKTsKKyAgICAgICAgaWYgKGZyYW1lLmlzTWFpbkZyYW1l KCkpCisgICAgICAgICAgICB0aGlzLl9tYWluRnJhbWVOYXZpZ2F0ZWQoZXZlbnQpOworICAgIH0s CisKICAgICAvKioKICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5FdmVudH0gZXZlbnQKICAg ICAgKi8KLSAgICBfaW5zcGVjdGVkVVJMQ2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgX21h aW5GcmFtZU5hdmlnYXRlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLl9y ZXNldFNvdXJjZU1hcHBpbmdzKCk7CiAgICAgICAgIHRoaXMuX3Jlc291cmNlQmluZGluZy5fcmVz ZXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VTY3JpcHRNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKaW5kZXggMzkzNWIwMDE4YTg0Y2FlZjBmMDdlMWFj NjljYmJkNmNlNTc4ZjJiNy4uYTFiYzk0NmI5Y2YwNjI5ZmQzNGNiZjZmMzA0NDZlNzY4Y2I5Mjc2 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZVNjcmlwdE1hcHBpbmcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKQEAgLTM5LDcgKzM5LDcgQEAgV2ViSW5zcGVjdG9y LlJlc291cmNlU2NyaXB0TWFwcGluZyA9IGZ1bmN0aW9uKHdvcmtzcGFjZSkKICAgICB0aGlzLl93 b3Jrc3BhY2UuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlUHJvdmlk ZXIuRXZlbnRzLlVJU291cmNlQ29kZUFkZGVkLCB0aGlzLl91aVNvdXJjZUNvZGVBZGRlZFRvV29y a3NwYWNlLCB0aGlzKTsKIAogICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkdsb2JhbE9iamVjdENs ZWFyZWQsIHRoaXMuX2RlYnVnZ2VyUmVzZXQsIHRoaXMpOwotICAgIHRoaXMuX2RlYnVnZ2VyUmVz ZXQoKTsKKyAgICB0aGlzLl9pbml0aWFsaXplKCk7CiB9CiAKIFdlYkluc3BlY3Rvci5SZXNvdXJj ZVNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewpAQCAtMTc5LDEzICsxNzksNDggQEAgV2ViSW5z cGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHVpU291 cmNlQ29kZS5zZXRTb3VyY2VNYXBwaW5nKHRoaXMpOwogICAgIH0sCiAKLSAgICBfZGVidWdnZXJS ZXNldDogZnVuY3Rpb24oKQorICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJ U291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCisgICAgICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVj dG9yLlNjcmlwdD59IHNjcmlwdHMKKyAgICAgKi8KKyAgICBfdW5iaW5kVUlTb3VyY2VDb2RlRnJv bVNjcmlwdHM6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwgc2NyaXB0cykKKyAgICB7CisgICAgICAg IGNvbnNvbGUuYXNzZXJ0KHNjcmlwdHMubGVuZ3RoKTsKKyAgICAgICAgdmFyIHNjcmlwdEZpbGUg PSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdEZpbGV9ICovICh1aVNvdXJj ZUNvZGUuc2NyaXB0RmlsZSgpKTsKKyAgICAgICAgc2NyaXB0RmlsZS5kaXNwb3NlKCk7CisgICAg ICAgIHVpU291cmNlQ29kZS5zZXRTY3JpcHRGaWxlKG51bGwpOworICAgICAgICB1aVNvdXJjZUNv ZGUuc2V0U291cmNlTWFwcGluZyhudWxsKTsKKyAgICB9LAorCisgICAgX2luaXRpYWxpemU6IGZ1 bmN0aW9uKCkKICAgICB7CiAgICAgICAgIC8qKiBAdHlwZSB7IU9iamVjdC48c3RyaW5nLCAhQXJy YXkuPCFXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlPj59ICovCiAgICAgICAgIHRoaXMuX2lubGlu ZVNjcmlwdHNGb3JTb3VyY2VVUkwgPSB7fTsKICAgICAgICAgLyoqIEB0eXBlIHshT2JqZWN0Ljxz dHJpbmcsICFBcnJheS48IVdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+Pn0gKi8KICAgICAgICAg dGhpcy5fbm9uSW5saW5lU2NyaXB0c0ZvclNvdXJjZVVSTCA9IHt9OwogICAgIH0sCisKKyAgICBf ZGVidWdnZXJSZXNldDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgLyoqCisgICAgICAgICAq IEBwYXJhbSB7IU9iamVjdC48c3RyaW5nLCAhQXJyYXkuPCFXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlPj59IHNjcmlwdHNGb3JTb3VyY2VVUkwKKyAgICAgICAgICovCisgICAgICAgIGZ1bmN0aW9u IHVuYmluZFVJU291cmNlQ29kZXMoc2NyaXB0c0ZvclNvdXJjZVVSTCkgeworICAgICAgICAgICAg Zm9yICh2YXIgc291cmNlVVJMIGluIHNjcmlwdHNGb3JTb3VyY2VVUkwpIHsKKyAgICAgICAgICAg ICAgICB2YXIgc2NyaXB0cyA9IHNjcmlwdHNGb3JTb3VyY2VVUkxbc291cmNlVVJMXTsKKyAgICAg ICAgICAgICAgICBpZiAoIXNjcmlwdHMubGVuZ3RoKQorICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gdGhpcy5fd29ya3NwYWNl VUlTb3VyY2VDb2RlRm9yU2NyaXB0KHNjcmlwdHNbMF0pOworICAgICAgICAgICAgICAgIGlmICgh dWlTb3VyY2VDb2RlKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAg ICAgICB0aGlzLl91bmJpbmRVSVNvdXJjZUNvZGVGcm9tU2NyaXB0cyh1aVNvdXJjZUNvZGUsIHNj cmlwdHMpOworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgdW5iaW5kVUlTb3Vy Y2VDb2Rlcy5jYWxsKHRoaXMsIHRoaXMuX2lubGluZVNjcmlwdHNGb3JTb3VyY2VVUkwpOworICAg ICAgICB1bmJpbmRVSVNvdXJjZUNvZGVzLmNhbGwodGhpcywgdGhpcy5fbm9uSW5saW5lU2NyaXB0 c0ZvclNvdXJjZVVSTCk7CisgICAgICAgIHRoaXMuX2luaXRpYWxpemUoKTsKKyAgICB9LAogfQog CiAvKioKQEAgLTMwMyw1ICszMzgsMTEgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0Rmls ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9pc0RpdmVyZ2luZ0Zyb21WTTsK ICAgICB9LAogCisgICAgZGlzcG9zZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5f dWlTb3VyY2VDb2RlLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29k ZS5FdmVudHMuV29ya2luZ0NvcHlDb21taXR0ZWQsIHRoaXMuX3dvcmtpbmdDb3B5Q29tbWl0dGVk LCB0aGlzKTsKKyAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlLnJlbW92ZUV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVudHMuV29ya2luZ0NvcHlDaGFuZ2VkLCB0aGlz Ll93b3JraW5nQ29weUNoYW5nZWQsIHRoaXMpOworICAgIH0sCisKICAgICBfX3Byb3RvX186IFdl Ykluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdFNuaXBwZXRNb2RlbC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzCmluZGV4IGMyZGRh YWNkMDYxMDc3ZTA3MDFiYzY2NTM3M2Q2M2IzYTYxZTVkZjAuLjdjZTMyZjMwY2FiMGJkZWVmZWZm NjFjNjU1YTM5MTkyZTBlODRmOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzCkBAIC0zNiw4ICszNiwxMCBA QAogV2ViSW5zcGVjdG9yLlNjcmlwdFNuaXBwZXRNb2RlbCA9IGZ1bmN0aW9uKHdvcmtzcGFjZSkK IHsKICAgICB0aGlzLl93b3Jrc3BhY2UgPSB3b3Jrc3BhY2U7CisgICAgLyoqIHtPYmplY3QuPHN0 cmluZywgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZT59ICovCiAgICAgdGhpcy5fdWlTb3VyY2VD b2RlRm9yU2NyaXB0SWQgPSB7fTsKICAgICB0aGlzLl9zY3JpcHRGb3JVSVNvdXJjZUNvZGUgPSBu ZXcgTWFwKCk7CisgICAgLyoqIHtPYmplY3QuPHN0cmluZywgV2ViSW5zcGVjdG9yLlVJU291cmNl Q29kZT59ICovCiAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9yU25pcHBldElkID0ge307CiAgICAg dGhpcy5fc25pcHBldElkRm9yVUlTb3VyY2VDb2RlID0gbmV3IE1hcCgpOwogICAgIApAQCAtNDcs NiArNDksNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsID0gZnVuY3Rpb24od29y a3NwYWNlKQogICAgIHRoaXMuX3dvcmtzcGFjZVByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5T aW1wbGVXb3Jrc3BhY2VQcm92aWRlcih0aGlzLl93b3Jrc3BhY2UpOwogICAgIHdvcmtzcGFjZS5h ZGRQcm9qZWN0KFdlYkluc3BlY3Rvci5wcm9qZWN0TmFtZXMuU25pcHBldHMsIHRoaXMuX3dvcmtz cGFjZVByb3ZpZGVyKTsKICAgICB0aGlzLnJlc2V0KCk7CisgICAgV2ViSW5zcGVjdG9yLmRlYnVn Z2VyTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVu dHMuR2xvYmFsT2JqZWN0Q2xlYXJlZCwgdGhpcy5fZGVidWdnZXJSZXNldCwgdGhpcyk7CiB9CiAK IFdlYkluc3BlY3Rvci5TY3JpcHRTbmlwcGV0TW9kZWwucHJvdG90eXBlID0gewpAQCAtMzQyLDYg KzM0NSwxNCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgcmV0dXJuIHNjcmlwdC5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbigwLCAwKS51aVNv dXJjZUNvZGU7CiAgICAgfSwKIAorICAgIF9kZWJ1Z2dlclJlc2V0OiBmdW5jdGlvbigpCisgICAg eworICAgICAgICBmb3IgKHZhciBzbmlwcGV0SWQgaW4gdGhpcy5fdWlTb3VyY2VDb2RlRm9yU25p cHBldElkKSB7CisgICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gdGhpcy5fdWlTb3VyY2VD b2RlRm9yU25pcHBldElkW3NuaXBwZXRJZF07CisgICAgICAgICAgICB0aGlzLl9yZWxlYXNlU25p cHBldFNjcmlwdCh1aVNvdXJjZUNvZGUpOworICAgICAgICB9CisgICAgfSwKKwogICAgIC8qKgog ICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCiAg ICAgICogQHJldHVybiB7c3RyaW5nfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TdHlsZXNTb3VyY2VNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTb3VyY2VNYXBwaW5nLmpzCmluZGV4IDgzYjZkNWJkODVl MjI0Zjc2YWIwM2NmY2NkZDZmZTlhZDgzYjIzNjAuLmY3NTBlOTYwZjQwZDM4ZmVmY2IxMDNkZDU0 ZjM0NTJkZjE2YWYzODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU3R5bGVzU291cmNlTWFwcGluZy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1N0eWxlc1NvdXJjZU1hcHBpbmcuanMKQEAgLTM5LDcgKzM5LDEwIEBAIFdl Ykluc3BlY3Rvci5TdHlsZXNTb3VyY2VNYXBwaW5nID0gZnVuY3Rpb24od29ya3NwYWNlKQogICAg IHRoaXMuX3dvcmtzcGFjZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2Uu RXZlbnRzLlByb2plY3RXaWxsUmVzZXQsIHRoaXMuX3Byb2plY3RXaWxsUmVzZXQsIHRoaXMpOwog ICAgIHRoaXMuX3dvcmtzcGFjZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJj ZUNvZGVQcm92aWRlci5FdmVudHMuVUlTb3VyY2VDb2RlQWRkZWQsIHRoaXMuX3VpU291cmNlQ29k ZUFkZGVkVG9Xb3Jrc3BhY2UsIHRoaXMpOwogCi0gICAgdGhpcy5fbWFwcGVkVVJMcyA9IHt9Owor ICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkZyYW1lQWRkZWQsIHRoaXMuX2Zy YW1lQWRkZWQsIHRoaXMpOworICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLk1h aW5GcmFtZU5hdmlnYXRlZCwgdGhpcy5fbWFpbkZyYW1lTmF2aWdhdGVkLCB0aGlzKTsKKyAgICBX ZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5SZXNvdXJjZUFkZGVkLCB0aGlzLl9yZXNv dXJjZUFkZGVkLCB0aGlzKTsKKyAgICB0aGlzLl9pbml0aWFsaXplKCk7CiB9CiAKIFdlYkluc3Bl Y3Rvci5TdHlsZXNTb3VyY2VNYXBwaW5nLnByb3RvdHlwZSA9IHsKQEAgLTY2LDYgKzY5LDIwIEBA IFdlYkluc3BlY3Rvci5TdHlsZXNTb3VyY2VNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAg cmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuQ1NTTG9jYXRpb24odWlTb3VyY2VDb2RlLnVybCB8fCAi IiwgbGluZU51bWJlcik7CiAgICAgfSwKIAorICAgIF9yZXNvdXJjZUFkZGVkOiBmdW5jdGlvbihl dmVudCkKKyAgICB7CisgICAgICAgIHZhciByZXNvdXJjZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVj dG9yLlVJU291cmNlQ29kZX0gKi8gKGV2ZW50LmRhdGEpOworICAgICAgICBpZiAocmVzb3VyY2Uu Y29udGVudFR5cGUoKSAhPT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuU3R5bGVzaGVldCkK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgaWYgKCFyZXNvdXJjZS51cmwpCisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIHZhciB1cmkgPSBXZWJJbnNwZWN0b3IuZmlsZU1hcHBpbmcu dXJpRm9yVVJMKHJlc291cmNlLnVybCk7CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSB0aGlz Ll93b3Jrc3BhY2UudWlTb3VyY2VDb2RlRm9yVVJJKHVyaSk7CisgICAgICAgIGlmICghdWlTb3Vy Y2VDb2RlKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB0aGlzLl9iaW5kVUlTb3VyY2VD b2RlKHVpU291cmNlQ29kZSk7CisgICAgfSwKKwogICAgIF91aVNvdXJjZUNvZGVBZGRlZFRvV29y a3NwYWNlOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUg PSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9ICovIChldmVudC5kYXRhKTsK QEAgLTczLDYgKzkwLDExIEBAIFdlYkluc3BlY3Rvci5TdHlsZXNTb3VyY2VNYXBwaW5nLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgaWYgKCF1aVNvdXJjZUNvZGUu dXJsIHx8ICFXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwodWlTb3VyY2VDb2RlLnVybCkpCiAg ICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMuX2JpbmRVSVNvdXJjZUNvZGUodWlTb3Vy Y2VDb2RlKTsKKyAgICB9LAorCisgICAgX2JpbmRVSVNvdXJjZUNvZGU6IGZ1bmN0aW9uKHVpU291 cmNlQ29kZSkKKyAgICB7CiAgICAgICAgIGlmICh0aGlzLl9tYXBwZWRVUkxzW3VpU291cmNlQ29k ZS51cmxdKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB0aGlzLl9tYXBwZWRVUkxzW3Vp U291cmNlQ29kZS51cmxdID0gdHJ1ZTsKQEAgLTg4LDYgKzExMCwzNiBAQCBXZWJJbnNwZWN0b3Iu U3R5bGVzU291cmNlTWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB1aVNvdXJjZUNv ZGVzID0gcHJvamVjdC51aVNvdXJjZUNvZGVzKCk7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgdWlTb3VyY2VDb2RlczsgKytpKQogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX21hcHBlZFVS THNbdWlTb3VyY2VDb2Rlc1tpXS51cmxdOworICAgIH0sCisKKyAgICBfaW5pdGlhbGl6ZTogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgLyoqIHtPYmplY3QuPHN0cmluZywgYm9vbGVhbj59ICov CisgICAgICAgIHRoaXMuX21hcHBlZFVSTHMgPSB7fTsKKyAgICB9LAorCisgICAgX2ZyYW1lQWRk ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFyIGZyYW1lID0gLyoqIEB0eXBl IHtXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRnJhbWV9ICovIChldmVudC5kYXRhKTsKKyAgICAg ICAgaWYgKGZyYW1lLmlzTWFpbkZyYW1lKCkpCisgICAgICAgICAgICB0aGlzLl9tYWluRnJhbWVO YXZpZ2F0ZWQoZXZlbnQpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5FdmVudH0gZXZlbnQKKyAgICAgKi8KKyAgICBfbWFpbkZyYW1lTmF2aWdhdGVkOiBm dW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIGZvciAodmFyIG1hcHBlZFVSTCBpbiB0aGlz Ll9tYXBwZWRVUkxzKSB7CisgICAgICAgICAgICB2YXIgdXJpID0gV2ViSW5zcGVjdG9yLmZpbGVN YXBwaW5nLnVyaUZvclVSTChtYXBwZWRVUkwpOworICAgICAgICAgICAgdmFyIHVpU291cmNlQ29k ZSA9IHRoaXMuX3dvcmtzcGFjZS51aVNvdXJjZUNvZGVGb3JVUkkodXJpKTsKKyAgICAgICAgICAg IGlmICghdWlTb3VyY2VDb2RlKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAg ICAgdWlTb3VyY2VDb2RlLnN0eWxlRmlsZSgpLmRpc3Bvc2UoKTsKKyAgICAgICAgICAgIHVpU291 cmNlQ29kZS5zZXRTdHlsZUZpbGUobnVsbCk7CisgICAgICAgICAgICB1aVNvdXJjZUNvZGUuc2V0 U291cmNlTWFwcGluZyhudWxsKTsKKyAgICAgICAgfQorICAgICAgICB0aGlzLl9pbml0aWFsaXpl KCk7CiAgICAgfQogfQogCkBAIC0xNjAsNiArMjEyLDEyIEBAIFdlYkluc3BlY3Rvci5TdHlsZUZp bGUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGUuYWRkUmV2aXNpb24o Y29udGVudCk7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9pc0FkZGluZ1JldmlzaW9uOwogICAgIH0s CisKKyAgICBkaXNwb3NlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl91aVNvdXJj ZUNvZGUucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50 cy5Xb3JraW5nQ29weUNvbW1pdHRlZCwgdGhpcy5fd29ya2luZ0NvcHlDb21taXR0ZWQsIHRoaXMp OworICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGUucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Xb3JraW5nQ29weUNoYW5nZWQsIHRoaXMuX3dvcmtp bmdDb3B5Q2hhbmdlZCwgdGhpcyk7CisgICAgfQogfQogCiAK 182985 2013-01-16 08:14:58 -0800 2013-01-16 08:41:19 -0800 Patch bug-107008-20130116201158.patch text/plain 14642 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5ODgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDg5NmQyZTlhOGNjMzAw ZTE3ZGFmZTFmNDEwNTFmNGZiYzk3YWNmYS4uODJkNGJlYTdlNWFhNjZlN2Q3MWU4NWJiZjYxMGY3 MDA0YjIzODViMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEzLTAxLTE2ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFVJU291cmNlQ29kZSBzY3JpcHRGaWxlIC8gc3R5bGVGaWxlIHNob3VsZCBiZSByZXNldCBv biBuYXZpZ2F0aW9uIChkZWJ1Z2dlciBvciBjc3MgbW9kZWwgcmVzZXQpLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MDA4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2NyaXB0RmlsZXMgYW5kIHN0eWxl RmlsZXMgYXJlIG5vdyByZXNldCBhbmQgZGlzcG9zZWQgb24gVUlTb3VyY2VDb2RlcyBvbiBjb3Jy ZXNwb25kaW5nIG1vZGVscyByZXNldC4KKyAgICAgICAgU3R5bGVTb3VyY2VNYXBwaW5nIG5vdyB0 cmllcyB0byBzZXR1cCBtYXBwaW5nIGZvciBuZXdseSBhZGRlZCByZXNvdXJjZSBhcyB3ZWxsIGFz IGZvciB1aVNvdXJjZUNvZGVzIHByZXZpb3VzbHkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0NTU1N0eWxlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVN b2RlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUuX21h aW5GcmFtZUNyZWF0ZWRPck5hdmlnYXRlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VTY3JpcHRNYXBwaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdE1h cHBpbmcucHJvdG90eXBlLl91bmJpbmRVSVNvdXJjZUNvZGVGcm9tU2NyaXB0cyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5faW5pdGlhbGl6 ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTY3JpcHRNYXBwaW5nLnByb3RvdHlw ZS5fZGVidWdnZXJSZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTY3JpcHRG aWxlLnByb3RvdHlwZS5kaXNwb3NlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlVHJlZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1v ZGVsLnByb3RvdHlwZS5fYWRkRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNl VHJlZU1vZGVsLnByb3RvdHlwZS5fZnJhbWVOYXZpZ2F0ZWQpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNjcmlwdFNuaXBwZXRNb2RlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBl dE1vZGVsLnByb3RvdHlwZS5fZGVidWdnZXJSZXNldCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9TdHlsZXNTb3VyY2VNYXBwaW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0 eWxlc1NvdXJjZU1hcHBpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1NvdXJjZU1h cHBpbmcucHJvdG90eXBlLl9yZXNvdXJjZUFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T dHlsZXNTb3VyY2VNYXBwaW5nLnByb3RvdHlwZS5fdWlTb3VyY2VDb2RlQWRkZWRUb1dvcmtzcGFj ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU291cmNlTWFwcGluZy5wcm90b3R5cGUu X2JpbmRVSVNvdXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1NvdXJjZU1h cHBpbmcucHJvdG90eXBlLl9wcm9qZWN0V2lsbFJlc2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TdHlsZXNTb3VyY2VNYXBwaW5nLnByb3RvdHlwZS5faW5pdGlhbGl6ZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU3R5bGVzU291cmNlTWFwcGluZy5wcm90b3R5cGUuX21haW5GcmFtZUNyZWF0 ZWRPck5hdmlnYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVGaWxlLnByb3RvdHlw ZS5kaXNwb3NlKToKKwogMjAxMy0wMS0xNiAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNvb2tpZXMgd2l0aCBlbXB0eSB2YWx1 ZSBhcmUgcGFyc2VkIGluY29ycmVjdGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKaW5kZXggMDZjY2RkMTE0NmM5MjI0Y2Q2YWJh ZTQxMmVlMGQ3YjEwZjQzNWY5NC4uNjdiODdjOTQ4Y2RhMjUxZjdiMTI4ZWM0M2FiOTNmNjFiNGM3 Y2JmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NT dHlsZU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NT U3R5bGVNb2RlbC5qcwpAQCAtNDEsNyArNDEsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2Rl bCA9IGZ1bmN0aW9uKCkKICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuRE9NQWdlbnQuRXZlbnRzLlVuZG9SZWRvUmVxdWVzdGVkLCB0aGlzLl91 bmRvUmVkb1JlcXVlc3RlZCwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLmRvbUFnZW50LmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRPTUFnZW50LkV2ZW50cy5VbmRvUmVkb0NvbXBsZXRl ZCwgdGhpcy5fdW5kb1JlZG9Db21wbGV0ZWQsIHRoaXMpOwogICAgIHRoaXMuX3Jlc291cmNlQmlu ZGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJlc291cmNlQmluZGluZygpOwot ICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkluc3BlY3RlZFVSTENoYW5nZWQs IHRoaXMuX2luc3BlY3RlZFVSTENoYW5nZWQsIHRoaXMpOworICAgIFdlYkluc3BlY3Rvci5yZXNv dXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVN b2RlbC5FdmVudFR5cGVzLk1haW5GcmFtZUNyZWF0ZWRPck5hdmlnYXRlZCwgdGhpcy5fbWFpbkZy YW1lQ3JlYXRlZE9yTmF2aWdhdGVkLCB0aGlzKTsKICAgICB0aGlzLl9uYW1lZEZsb3dDb2xsZWN0 aW9ucyA9IHt9OwogICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5ET01BZ2VudC5FdmVudHMuRG9jdW1lbnRVcGRhdGVkLCB0aGlzLl9yZXNldE5h bWVkRmxvd0NvbGxlY3Rpb25zLCB0aGlzKTsKICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVy Q1NTRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkNTU0Rpc3BhdGNoZXIodGhpcykpOwpAQCAt NTgsNyArNTgsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wYXJzZVJ1bGVBcnJheVBh eWxvYWQgPSBmdW5jdGlvbihydWxlQXJyYXkpCiAgICAgICAgIHJlc3VsdC5wdXNoKFdlYkluc3Bl Y3Rvci5DU1NSdWxlLnBhcnNlUGF5bG9hZChydWxlQXJyYXlbaV0pKTsKICAgICByZXR1cm4gcmVz dWx0OwogfQotCisgICAgCiAvKioKICAqIEBwYXJhbSB7QXJyYXkuPENTU0FnZW50LlJ1bGVNYXRj aD59IG1hdGNoQXJyYXkKICAqLwpAQCAtNDgyLDcgKzQ4Miw3IEBAIFdlYkluc3BlY3Rvci5DU1NT dHlsZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAvKioKICAgICAgKiBAcGFyYW0ge1dlYkluc3Bl Y3Rvci5FdmVudH0gZXZlbnQKICAgICAgKi8KLSAgICBfaW5zcGVjdGVkVVJMQ2hhbmdlZDogZnVu Y3Rpb24oZXZlbnQpCisgICAgX21haW5GcmFtZUNyZWF0ZWRPck5hdmlnYXRlZDogZnVuY3Rpb24o ZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLl9yZXNldFNvdXJjZU1hcHBpbmdzKCk7CiAgICAg ICAgIHRoaXMuX3Jlc291cmNlQmluZGluZy5fcmVzZXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VTY3JpcHRNYXBwaW5nLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMK aW5kZXggMzkzNWIwMDE4YTg0Y2FlZjBmMDdlMWFjNjljYmJkNmNlNTc4ZjJiNy4uYmM5OGNmOGMz ZDRlYzA1ZDQ1NzllNzJmNzc3ODFiMzNkNzljZjRmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMK QEAgLTM5LDcgKzM5LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGluZyA9IGZ1 bmN0aW9uKHdvcmtzcGFjZSkKICAgICB0aGlzLl93b3Jrc3BhY2UuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlUHJvdmlkZXIuRXZlbnRzLlVJU291cmNlQ29kZUFkZGVk LCB0aGlzLl91aVNvdXJjZUNvZGVBZGRlZFRvV29ya3NwYWNlLCB0aGlzKTsKIAogICAgIFdlYklu c3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyTW9kZWwuRXZlbnRzLkdsb2JhbE9iamVjdENsZWFyZWQsIHRoaXMuX2RlYnVnZ2VyUmVzZXQs IHRoaXMpOwotICAgIHRoaXMuX2RlYnVnZ2VyUmVzZXQoKTsKKyAgICB0aGlzLl9pbml0aWFsaXpl KCk7CiB9CiAKIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0g ewpAQCAtMTc5LDEzICsxNzksNDkgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGlu Zy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHVpU291cmNlQ29kZS5zZXRTb3VyY2VNYXBwaW5nKHRo aXMpOwogICAgIH0sCiAKLSAgICBfZGVidWdnZXJSZXNldDogZnVuY3Rpb24oKQorICAgIC8qKgor ICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCisg ICAgICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVjdG9yLlNjcmlwdD59IHNjcmlwdHMKKyAgICAg Ki8KKyAgICBfdW5iaW5kVUlTb3VyY2VDb2RlRnJvbVNjcmlwdHM6IGZ1bmN0aW9uKHVpU291cmNl Q29kZSwgc2NyaXB0cykKKyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHNjcmlwdHMubGVu Z3RoKTsKKyAgICAgICAgdmFyIHNjcmlwdEZpbGUgPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5S ZXNvdXJjZVNjcmlwdEZpbGV9ICovICh1aVNvdXJjZUNvZGUuc2NyaXB0RmlsZSgpKTsKKyAgICAg ICAgc2NyaXB0RmlsZS5kaXNwb3NlKCk7CisgICAgICAgIHVpU291cmNlQ29kZS5zZXRTY3JpcHRG aWxlKG51bGwpOworICAgICAgICB1aVNvdXJjZUNvZGUuc2V0U291cmNlTWFwcGluZyhudWxsKTsK KyAgICB9LAorCisgICAgX2luaXRpYWxpemU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIC8q KiBAdHlwZSB7IU9iamVjdC48c3RyaW5nLCAhQXJyYXkuPCFXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlPj59ICovCiAgICAgICAgIHRoaXMuX2lubGluZVNjcmlwdHNGb3JTb3VyY2VVUkwgPSB7fTsK ICAgICAgICAgLyoqIEB0eXBlIHshT2JqZWN0LjxzdHJpbmcsICFBcnJheS48IVdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGU+Pn0gKi8KICAgICAgICAgdGhpcy5fbm9uSW5saW5lU2NyaXB0c0ZvclNv dXJjZVVSTCA9IHt9OwogICAgIH0sCisKKyAgICBfZGVidWdnZXJSZXNldDogZnVuY3Rpb24oKQor ICAgIHsKKyAgICAgICAgLyoqCisgICAgICAgICAqIEBwYXJhbSB7IU9iamVjdC48c3RyaW5nLCAh QXJyYXkuPCFXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlPj59IHNjcmlwdHNGb3JTb3VyY2VVUkwK KyAgICAgICAgICovCisgICAgICAgIGZ1bmN0aW9uIHVuYmluZFVJU291cmNlQ29kZXMoc2NyaXB0 c0ZvclNvdXJjZVVSTCkKKyAgICAgICAgeworICAgICAgICAgICAgZm9yICh2YXIgc291cmNlVVJM IGluIHNjcmlwdHNGb3JTb3VyY2VVUkwpIHsKKyAgICAgICAgICAgICAgICB2YXIgc2NyaXB0cyA9 IHNjcmlwdHNGb3JTb3VyY2VVUkxbc291cmNlVVJMXTsKKyAgICAgICAgICAgICAgICBpZiAoIXNj cmlwdHMubGVuZ3RoKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAg ICAgICB2YXIgdWlTb3VyY2VDb2RlID0gdGhpcy5fd29ya3NwYWNlVUlTb3VyY2VDb2RlRm9yU2Ny aXB0KHNjcmlwdHNbMF0pOworICAgICAgICAgICAgICAgIGlmICghdWlTb3VyY2VDb2RlKQorICAg ICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICB0aGlzLl91bmJpbmRV SVNvdXJjZUNvZGVGcm9tU2NyaXB0cyh1aVNvdXJjZUNvZGUsIHNjcmlwdHMpOworICAgICAgICAg ICAgfQorICAgICAgICB9CisKKyAgICAgICAgdW5iaW5kVUlTb3VyY2VDb2Rlcy5jYWxsKHRoaXMs IHRoaXMuX2lubGluZVNjcmlwdHNGb3JTb3VyY2VVUkwpOworICAgICAgICB1bmJpbmRVSVNvdXJj ZUNvZGVzLmNhbGwodGhpcywgdGhpcy5fbm9uSW5saW5lU2NyaXB0c0ZvclNvdXJjZVVSTCk7Cisg ICAgICAgIHRoaXMuX2luaXRpYWxpemUoKTsKKyAgICB9LAogfQogCiAvKioKQEAgLTMwMyw1ICsz MzksMTEgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0RmlsZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHJldHVybiB0aGlzLl9pc0RpdmVyZ2luZ0Zyb21WTTsKICAgICB9LAogCisgICAgZGlz cG9zZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlLnJlbW92 ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVudHMuV29ya2luZ0Nv cHlDb21taXR0ZWQsIHRoaXMuX3dvcmtpbmdDb3B5Q29tbWl0dGVkLCB0aGlzKTsKKyAgICAgICAg dGhpcy5fdWlTb3VyY2VDb2RlLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291 cmNlQ29kZS5FdmVudHMuV29ya2luZ0NvcHlDaGFuZ2VkLCB0aGlzLl93b3JraW5nQ29weUNoYW5n ZWQsIHRoaXMpOworICAgIH0sCisKICAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5PYmplY3Qu cHJvdG90eXBlCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcwppbmRleCA0ZDdhMWExZTM2ZmI1MThmZmYxMzkwODEw YjY4ZGY3ZjdjMzE3OWJhLi4wYTg3NmViZmMzYmJkM2ZjOTRiZjExYTQxMGU4YTNjOTViZDM1OTdj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl VHJlZU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VUcmVlTW9kZWwuanMKQEAgLTU3LDYgKzU3LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl VHJlZU1vZGVsLkV2ZW50VHlwZXMgPSB7CiAgICAgRnJhbWVOYXZpZ2F0ZWQ6ICJGcmFtZU5hdmln YXRlZCIsCiAgICAgRnJhbWVEZXRhY2hlZDogIkZyYW1lRGV0YWNoZWQiLAogICAgIE1haW5GcmFt ZU5hdmlnYXRlZDogIk1haW5GcmFtZU5hdmlnYXRlZCIsCisgICAgTWFpbkZyYW1lQ3JlYXRlZE9y TmF2aWdhdGVkOiAiTWFpbkZyYW1lQ3JlYXRlZE9yTmF2aWdhdGVkIiwKICAgICBSZXNvdXJjZUFk ZGVkOiAiUmVzb3VyY2VBZGRlZCIsCiAgICAgV2lsbExvYWRDYWNoZWRSZXNvdXJjZXM6ICJXaWxs TG9hZENhY2hlZFJlc291cmNlcyIsCiAgICAgQ2FjaGVkUmVzb3VyY2VzTG9hZGVkOiAiQ2FjaGVk UmVzb3VyY2VzTG9hZGVkIiwKQEAgLTEwOCw2ICsxMDksOCBAQCBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VUcmVlTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAoZnJhbWUuaXNNYWluRnJhbWUo KSkKICAgICAgICAgICAgIHRoaXMubWFpbkZyYW1lID0gZnJhbWU7CiAgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVu dFR5cGVzLkZyYW1lQWRkZWQsIGZyYW1lKTsKKyAgICAgICAgaWYgKGZyYW1lLmlzTWFpbkZyYW1l KCkpCisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0 b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5NYWluRnJhbWVDcmVhdGVkT3JOYXZpZ2F0 ZWQsIGZyYW1lKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xMzcsOCArMTQwLDEwIEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBXZWJJ bnNwZWN0b3IuaW5zcGVjdGVkUGFnZVVSTCA9IGZyYW1lLnVybDsKIAogICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZl bnRUeXBlcy5GcmFtZU5hdmlnYXRlZCwgZnJhbWUpOwotICAgICAgICBpZiAoZnJhbWUuaXNNYWlu RnJhbWUoKSkKKyAgICAgICAgaWYgKGZyYW1lLmlzTWFpbkZyYW1lKCkpIHsKICAgICAgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVN b2RlbC5FdmVudFR5cGVzLk1haW5GcmFtZU5hdmlnYXRlZCwgZnJhbWUpOworICAgICAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1v ZGVsLkV2ZW50VHlwZXMuTWFpbkZyYW1lQ3JlYXRlZE9yTmF2aWdhdGVkLCBmcmFtZSk7CisgICAg ICAgIH0KIAogICAgICAgICAvLyBGaWxsIGZyYW1lIHdpdGggcmV0YWluZWQgcmVzb3VyY2VzICh0 aGUgb25lcyBsb2FkZWQgdXNpbmcgbmV3IGxvYWRlcikuCiAgICAgICAgIHZhciByZXNvdXJjZXMg PSBmcmFtZS5yZXNvdXJjZXMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKaW5kZXggYzJkZGFhY2QwNjEwNzdl MDcwMWJjNjY1MzczZDYzYjNhNjFlNWRmMC4uN2NlMzJmMzBjYWIwYmRlZWZlZmY2MWM2NTVhMzkx OTJlMGU4NGY4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKQEAgLTM2LDggKzM2LDEwIEBACiBXZWJJbnNw ZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsID0gZnVuY3Rpb24od29ya3NwYWNlKQogewogICAgIHRo aXMuX3dvcmtzcGFjZSA9IHdvcmtzcGFjZTsKKyAgICAvKioge09iamVjdC48c3RyaW5nLCBXZWJJ bnNwZWN0b3IuVUlTb3VyY2VDb2RlPn0gKi8KICAgICB0aGlzLl91aVNvdXJjZUNvZGVGb3JTY3Jp cHRJZCA9IHt9OwogICAgIHRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29kZSA9IG5ldyBNYXAoKTsK KyAgICAvKioge09iamVjdC48c3RyaW5nLCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlPn0gKi8K ICAgICB0aGlzLl91aVNvdXJjZUNvZGVGb3JTbmlwcGV0SWQgPSB7fTsKICAgICB0aGlzLl9zbmlw cGV0SWRGb3JVSVNvdXJjZUNvZGUgPSBuZXcgTWFwKCk7CiAgICAgCkBAIC00Nyw2ICs0OSw3IEBA IFdlYkluc3BlY3Rvci5TY3JpcHRTbmlwcGV0TW9kZWwgPSBmdW5jdGlvbih3b3Jrc3BhY2UpCiAg ICAgdGhpcy5fd29ya3NwYWNlUHJvdmlkZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlNpbXBsZVdvcmtz cGFjZVByb3ZpZGVyKHRoaXMuX3dvcmtzcGFjZSk7CiAgICAgd29ya3NwYWNlLmFkZFByb2plY3Qo V2ViSW5zcGVjdG9yLnByb2plY3ROYW1lcy5TbmlwcGV0cywgdGhpcy5fd29ya3NwYWNlUHJvdmlk ZXIpOwogICAgIHRoaXMucmVzZXQoKTsKKyAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5HbG9iYWxP YmplY3RDbGVhcmVkLCB0aGlzLl9kZWJ1Z2dlclJlc2V0LCB0aGlzKTsKIH0KIAogV2ViSW5zcGVj dG9yLlNjcmlwdFNuaXBwZXRNb2RlbC5wcm90b3R5cGUgPSB7CkBAIC0zNDIsNiArMzQ1LDE0IEBA IFdlYkluc3BlY3Rvci5TY3JpcHRTbmlwcGV0TW9kZWwucHJvdG90eXBlID0gewogICAgICAgICBy ZXR1cm4gc2NyaXB0LnJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uKDAsIDApLnVpU291cmNlQ29kZTsK ICAgICB9LAogCisgICAgX2RlYnVnZ2VyUmVzZXQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAg IGZvciAodmFyIHNuaXBwZXRJZCBpbiB0aGlzLl91aVNvdXJjZUNvZGVGb3JTbmlwcGV0SWQpIHsK KyAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSB0aGlzLl91aVNvdXJjZUNvZGVGb3JTbmlw cGV0SWRbc25pcHBldElkXTsKKyAgICAgICAgICAgIHRoaXMuX3JlbGVhc2VTbmlwcGV0U2NyaXB0 KHVpU291cmNlQ29kZSk7CisgICAgICAgIH0KKyAgICB9LAorCiAgICAgLyoqCiAgICAgICogQHBh cmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKICAgICAgKiBAcmV0 dXJuIHtzdHJpbmd9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1N0eWxlc1NvdXJjZU1hcHBpbmcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1N0eWxlc1NvdXJjZU1hcHBpbmcuanMKaW5kZXggODNiNmQ1YmQ4NWUyMjRmNzZhYjAz Y2ZjY2RkNmZlOWFkODNiMjM2MC4uM2M5MTM1OTY1YzRiY2U5YzM2NTIzMmYwZDgxMzgxM2VjYjNk N2NjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHls ZXNTb3VyY2VNYXBwaW5nLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU3R5bGVzU291cmNlTWFwcGluZy5qcwpAQCAtMzksNyArMzksOSBAQCBXZWJJbnNwZWN0b3Iu U3R5bGVzU291cmNlTWFwcGluZyA9IGZ1bmN0aW9uKHdvcmtzcGFjZSkKICAgICB0aGlzLl93b3Jr c3BhY2UuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuV29ya3NwYWNlLkV2ZW50cy5Qcm9q ZWN0V2lsbFJlc2V0LCB0aGlzLl9wcm9qZWN0V2lsbFJlc2V0LCB0aGlzKTsKICAgICB0aGlzLl93 b3Jrc3BhY2UuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlUHJvdmlk ZXIuRXZlbnRzLlVJU291cmNlQ29kZUFkZGVkLCB0aGlzLl91aVNvdXJjZUNvZGVBZGRlZFRvV29y a3NwYWNlLCB0aGlzKTsKIAotICAgIHRoaXMuX21hcHBlZFVSTHMgPSB7fTsKKyAgICBXZWJJbnNw ZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVz b3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5NYWluRnJhbWVDcmVhdGVkT3JOYXZpZ2F0ZWQsIHRo aXMuX21haW5GcmFtZUNyZWF0ZWRPck5hdmlnYXRlZCwgdGhpcyk7CisgICAgV2ViSW5zcGVjdG9y LnJlc291cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNl VHJlZU1vZGVsLkV2ZW50VHlwZXMuUmVzb3VyY2VBZGRlZCwgdGhpcy5fcmVzb3VyY2VBZGRlZCwg dGhpcyk7CisgICAgdGhpcy5faW5pdGlhbGl6ZSgpOwogfQogCiBXZWJJbnNwZWN0b3IuU3R5bGVz U291cmNlTWFwcGluZy5wcm90b3R5cGUgPSB7CkBAIC02Niw2ICs2OCwyMCBAQCBXZWJJbnNwZWN0 b3IuU3R5bGVzU291cmNlTWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBuZXcg V2ViSW5zcGVjdG9yLkNTU0xvY2F0aW9uKHVpU291cmNlQ29kZS51cmwgfHwgIiIsIGxpbmVOdW1i ZXIpOwogICAgIH0sCiAKKyAgICBfcmVzb3VyY2VBZGRlZDogZnVuY3Rpb24oZXZlbnQpCisgICAg eworICAgICAgICB2YXIgcmVzb3VyY2UgPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5VSVNvdXJj ZUNvZGV9ICovIChldmVudC5kYXRhKTsKKyAgICAgICAgaWYgKHJlc291cmNlLmNvbnRlbnRUeXBl KCkgIT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLlN0eWxlc2hlZXQpCisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIGlmICghcmVzb3VyY2UudXJsKQorICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB2YXIgdXJpID0gV2ViSW5zcGVjdG9yLmZpbGVNYXBwaW5nLnVyaUZvclVSTChy ZXNvdXJjZS51cmwpOworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gdGhpcy5fd29ya3NwYWNl LnVpU291cmNlQ29kZUZvclVSSSh1cmkpOworICAgICAgICBpZiAoIXVpU291cmNlQ29kZSkKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fYmluZFVJU291cmNlQ29kZSh1aVNvdXJj ZUNvZGUpOworICAgIH0sCisKICAgICBfdWlTb3VyY2VDb2RlQWRkZWRUb1dvcmtzcGFjZTogZnVu Y3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gLyoqIEB0eXBl IHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSAqLyAoZXZlbnQuZGF0YSk7CkBAIC03Myw2ICs4 OSwxMSBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU291cmNlTWFwcGluZy5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGlmICghdWlTb3VyY2VDb2RlLnVybCB8fCAhV2Vi SW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHVpU291cmNlQ29kZS51cmwpKQogICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB0aGlzLl9iaW5kVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSk7Cisg ICAgfSwKKworICAgIF9iaW5kVUlTb3VyY2VDb2RlOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCisg ICAgewogICAgICAgICBpZiAodGhpcy5fbWFwcGVkVVJMc1t1aVNvdXJjZUNvZGUudXJsXSkKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5fbWFwcGVkVVJMc1t1aVNvdXJjZUNvZGUu dXJsXSA9IHRydWU7CkBAIC04OCw2ICsxMDksMjkgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NvdXJj ZU1hcHBpbmcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgdWlTb3VyY2VDb2RlcyA9IHByb2pl Y3QudWlTb3VyY2VDb2RlcygpOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHVpU291cmNl Q29kZXM7ICsraSkKICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9tYXBwZWRVUkxzW3VpU291cmNl Q29kZXNbaV0udXJsXTsKKyAgICB9LAorCisgICAgX2luaXRpYWxpemU6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIC8qKiB7T2JqZWN0LjxzdHJpbmcsIGJvb2xlYW4+fSAqLworICAgICAgICB0 aGlzLl9tYXBwZWRVUkxzID0ge307CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7 V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAorICAgICAqLworICAgIF9tYWluRnJhbWVDcmVhdGVk T3JOYXZpZ2F0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgZm9yICh2YXIgbWFw cGVkVVJMIGluIHRoaXMuX21hcHBlZFVSTHMpIHsKKyAgICAgICAgICAgIHZhciB1cmkgPSBXZWJJ bnNwZWN0b3IuZmlsZU1hcHBpbmcudXJpRm9yVVJMKG1hcHBlZFVSTCk7CisgICAgICAgICAgICB2 YXIgdWlTb3VyY2VDb2RlID0gdGhpcy5fd29ya3NwYWNlLnVpU291cmNlQ29kZUZvclVSSSh1cmkp OworICAgICAgICAgICAgaWYgKCF1aVNvdXJjZUNvZGUpCisgICAgICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgICAgICB1aVNvdXJjZUNvZGUuc3R5bGVGaWxlKCkuZGlzcG9zZSgpOworICAg ICAgICAgICAgdWlTb3VyY2VDb2RlLnNldFN0eWxlRmlsZShudWxsKTsKKyAgICAgICAgICAgIHVp U291cmNlQ29kZS5zZXRTb3VyY2VNYXBwaW5nKG51bGwpOworICAgICAgICB9CisgICAgICAgIHRo aXMuX2luaXRpYWxpemUoKTsKICAgICB9CiB9CiAKQEAgLTE2MCw2ICsyMDQsMTIgQEAgV2ViSW5z cGVjdG9yLlN0eWxlRmlsZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3VpU291cmNlQ29k ZS5hZGRSZXZpc2lvbihjb250ZW50KTsKICAgICAgICAgZGVsZXRlIHRoaXMuX2lzQWRkaW5nUmV2 aXNpb247CiAgICAgfSwKKworICAgIGRpc3Bvc2U6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAg IHRoaXMuX3VpU291cmNlQ29kZS5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGUuRXZlbnRzLldvcmtpbmdDb3B5Q29tbWl0dGVkLCB0aGlzLl93b3JraW5nQ29weUNv bW1pdHRlZCwgdGhpcyk7CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZS5yZW1vdmVFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLldvcmtpbmdDb3B5Q2hhbmdl ZCwgdGhpcy5fd29ya2luZ0NvcHlDaGFuZ2VkLCB0aGlzKTsKKyAgICB9CiB9CiAKIAo=