129383 2014-02-26 12:48:57 -0800 Web Inspector: DataGrid columns should be objects not Maps 2014-04-29 13:52:22 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy burg burg commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 984854 0 timothy 2014-02-26 12:48:57 -0800 DataGrid recently started using Map for the objects in DataGrid.columns. These should be Object instead of Map. JSC can JIT property access to objects, but not Map. We can use bracket notation if strings are more desirable, though I don't know if JSC can JIT those as well as fully qualified identifiers. 984858 1 webkit-bug-importer 2014-02-26 12:50:34 -0800 <rdar://problem/16176134> 989763 2 timothy 2014-03-12 11:43:58 -0700 *** Bug 130035 has been marked as a duplicate of this bug. *** 1005005 3 230387 burg 2014-04-29 10:17:55 -0700 Created attachment 230387 the patch 1005096 4 230387 commit-queue 2014-04-29 13:52:19 -0700 Comment on attachment 230387 the patch Clearing flags on attachment: 230387 Committed r167955: <http://trac.webkit.org/changeset/167955> 1005097 5 commit-queue 2014-04-29 13:52:22 -0700 All reviewed patches have been landed. Closing bug. 230387 2014-04-29 10:17:55 -0700 2014-04-29 13:52:19 -0700 the patch bug-129383-20140429101733.patch text/plain 16659 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3OTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBk OTQ3OWJmMjE0Mjc2NTY1YTFhMDM5ODQzYzc0YTBhMWFjMTc2MWJiLi4wOTlhODUxM2RjNjQ5YzM0 NzlmY2VhMzJkZGU2YjQ5MzY4NGQwZmI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNiBAQAorMjAxNC0wNC0yOSAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRGF0YUdyaWQgY29sdW1ucyBzaG91bGQg YmUgb2JqZWN0cyBub3QgTWFwcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI5MzgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhpcyByZXZlcnRzIGFuIGVhcmxpZXIgY29udmVyc2lvbiB0byBtYXBzLCBz byB0aGF0IGNvbHVtbiBwcm9wZXJ0aWVzCisgICAgICAgICh3aGljaCByYXJlbHkgY2hhbmdlKSBj YW4gYmUgb3B0aW1pemVkLgorCisgICAgICAgIFN0cmluZyBsaXRlcmFscyBmb3IgY29sdW1uIHBy b3BlcnRpZXMgaGF2ZSBiZWVuIHByZXNlcnZlZCBzbyBjb2x1bW5zCisgICAgICAgIGNhbiBiZSBl YXNpbHkgY29udmVydGVkIGludG8gb2JqZWN0cyB3aXRoIG1ldGhvZHMuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRh dGFHcmlkLnByb3RvdHlwZS5hdXRvU2l6ZUNvbHVtbnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRhdGFHcmlkLnByb3RvdHlwZS5zZXQgdmFyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRh R3JpZC5wcm90b3R5cGUuc2V0IGlmKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5w cm90b3R5cGUuaW5zZXJ0Q29sdW1uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5w cm90b3R5cGUucmVtb3ZlQ29sdW1uLmdldCB0aGlzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E YXRhR3JpZC5wcm90b3R5cGUucmVtb3ZlQ29sdW1uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E YXRhR3JpZC5wcm90b3R5cGUuY29sdW1uV2lkdGhzTWFwKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5EYXRhR3JpZC5wcm90b3R5cGUuYXBwbHlDb2x1bW5XaWR0aHNNYXApOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5fY29sbGFwc2VDb2x1bW5Hcm91cFdpdGhDZWxs KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUucHJvdG90eXBlLmNyZWF0ZUNl bGwuZ2V0IGlmKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUucHJvdG90eXBl LmNyZWF0ZUNlbGwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5n ZXQgbGVuZ3RoKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2Jl U2V0RGF0YUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvYmVTZXREYXRhR3JpZC5w cm90b3R5cGUuX3Byb2JlRXhwcmVzc2lvbkNoYW5nZWQuZ2V0IHRoaXMpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlByb2JlU2V0RGF0YUdyaWQucHJvdG90eXBlLl9wcm9iZUV4cHJlc3Npb25DaGFu Z2VkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZC5wcm90b3R5cGUudHJlZUVs ZW1lbnRNYXRjaGVzQWN0aXZlU2NvcGVGaWx0ZXJzLnNjb3BlQmFyLnRoaXMuY29sdW1ucy5nZXQg c3RyaW5nX2FwcGVhcmVkX2hlcmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0 YUdyaWQucHJvdG90eXBlLnRyZWVFbGVtZW50TWF0Y2hlc0FjdGl2ZVNjb3BlRmlsdGVycyk6CisK IDIwMTQtMDQtMjUgIEpvbmF0aGFuIFdlbGxzICA8am9ub3dlbGxzQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBET00gVHJlZSBkZWJ1Z2dlciBwb3BvdmVyIG9ic2N1cmVzIGRh c2hib2FyZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9EYXRhR3JpZC5qcwppbmRleCA3MTA2MjA2MGI0OTdjMzBhM2UzOWJhODhmMmQzYmRiNzBk NGIzOTFiLi40ODQ1YjRmNmExN2RkOTBhZTcwMGQ4NmEyODZkN2IxODY1YTYwM2U0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3Jp ZC5qcwpAQCAtMTIxLDkgKzEyMSw5IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5jcmVhdGVTb3J0 YWJsZURhdGFHcmlkID0gZnVuY3Rpb24oY29sdW1uTmFtZXMsIHZhbHVlcykKIAogICAgIGZvciAo dmFyIGNvbHVtbk5hbWUgb2YgY29sdW1uTmFtZXMpIHsKICAgICAgICAgdmFyIGNvbHVtbiA9IHt9 OwotICAgICAgICBjb2x1bW4ud2lkdGggPSBjb2x1bW5OYW1lLmxlbmd0aDsKLSAgICAgICAgY29s dW1uLnRpdGxlID0gY29sdW1uTmFtZTsKLSAgICAgICAgY29sdW1uLnNvcnRhYmxlID0gdHJ1ZTsK KyAgICAgICAgY29sdW1uWyJ3aWR0aCJdID0gY29sdW1uTmFtZS5sZW5ndGg7CisgICAgICAgIGNv bHVtblsidGl0bGUiXSA9IGNvbHVtbk5hbWU7CisgICAgICAgIGNvbHVtblsic29ydGFibGUiXSA9 IHRydWU7CiAKICAgICAgICAgY29sdW1uc0RhdGFbY29sdW1uTmFtZV0gPSBjb2x1bW47CiAgICAg fQpAQCAtMjE1LDcgKzIxNSw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7 CiAgICAgc2V0IHNvcnRDb2x1bW5JZGVudGlmaWVyKGNvbHVtbklkZW50aWZpZXIpCiAgICAgewog ICAgICAgICBjb25zb2xlLmFzc2VydChjb2x1bW5JZGVudGlmaWVyICYmIHRoaXMuY29sdW1ucy5o YXMoY29sdW1uSWRlbnRpZmllcikpOwotICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLmNvbHVt bnMuZ2V0KGNvbHVtbklkZW50aWZpZXIpLmhhcygic29ydGFibGUiKSk7CisgICAgICAgIGNvbnNv bGUuYXNzZXJ0KCJzb3J0YWJsZSIgaW4gdGhpcy5jb2x1bW5zLmdldChjb2x1bW5JZGVudGlmaWVy KSk7CiAKICAgICAgICAgaWYgKHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyID09PSBjb2x1bW5J ZGVudGlmaWVyKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMzUzLDcgKzM1Myw3IEBAIFdlYklu c3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB3aWR0aHMgPSB7fTsK ICAgICAgICAgLy8gRm9yIHRoZSBmaXJzdCB3aWR0aCBhcHByb3hpbWF0aW9uLCB1c2UgdGhlIGNo YXJhY3RlciBsZW5ndGggb2YgY29sdW1uIHRpdGxlcy4KICAgICAgICAgZm9yICh2YXIgW2lkZW50 aWZpZXIsIGNvbHVtbl0gb2YgdGhpcy5jb2x1bW5zKQotICAgICAgICAgICAgd2lkdGhzW2lkZW50 aWZpZXJdID0gY29sdW1uLmdldCgidGl0bGUiLCAiIikubGVuZ3RoOworICAgICAgICAgICAgd2lk dGhzW2lkZW50aWZpZXJdID0gKGNvbHVtblsidGl0bGUiXSB8fCAiIikubGVuZ3RoOwogCiAgICAg ICAgIC8vIE5vdyBhcHByb3hpbWF0ZSB0aGUgd2lkdGggb2YgZWFjaCBjb2x1bW4gYXMgbWF4KHRp dGxlLCBjZWxscykuCiAgICAgICAgIHZhciBjaGlsZHJlbiA9IG1heERlc2NlbnRMZXZlbCA/IHRo aXMuX2VudW1lcmF0ZUNoaWxkcmVuKHRoaXMsIFtdLCBtYXhEZXNjZW50TGV2ZWwgKyAxKSA6IHRo aXMuY2hpbGRyZW47CkBAIC00MDgsNyArNDA4LDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnBy b3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIGZvciAodmFyIFtpZGVudGlmaWVyLCBj b2x1bW5dIG9mIHRoaXMuY29sdW1ucykKLSAgICAgICAgICAgIGNvbHVtbi5nZXQoImVsZW1lbnQi KS5zdHlsZS53aWR0aCA9IHdpZHRoc1tpZGVudGlmaWVyXSArICIlIjsKKyAgICAgICAgICAgIGNv bHVtblsiZWxlbWVudCJdLnN0eWxlLndpZHRoID0gd2lkdGhzW2lkZW50aWZpZXJdICsgIiUiOwog ICAgICAgICB0aGlzLl9jb2x1bW5XaWR0aHNJbml0aWFsaXplZCA9IGZhbHNlOwogICAgICAgICB0 aGlzLnVwZGF0ZUxheW91dCgpOwogICAgIH0sCkBAIC00MjEsNTcgKzQyMSw1NSBAQCBXZWJJbnNw ZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICB2YXIgbGlzdGVuZXJzID0gbmV3 IFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyU2V0KHRoaXMsICJEYXRhR3JpZCBjb2x1bW4gRE9N IGxpc3RlbmVycyIpOwogCiAgICAgICAgIC8vIENvcHkgY29uZmlndXJhdGlvbiBwcm9wZXJ0aWVz IGluc3RlYWQgb2Yga2VlcGluZyBhIHJlZmVyZW5jZSB0byB0aGUgcGFzc2VkLWluIG9iamVjdC4K LSAgICAgICAgdmFyIGNvbHVtbiA9IG5ldyBNYXA7Ci0gICAgICAgIGZvciAodmFyIHByb3BlcnR5 TmFtZSBpbiBjb2x1bW5EYXRhKQotICAgICAgICAgICAgY29sdW1uLnNldChwcm9wZXJ0eU5hbWUs IGNvbHVtbkRhdGFbcHJvcGVydHlOYW1lXSk7CisgICAgICAgIHZhciBjb2x1bW4gPSBPYmplY3Qu c2hhbGxvd0NvcHkoY29sdW1uRGF0YSk7CisgICAgICAgIGNvbHVtblsibGlzdGVuZXJzIl0gPSBs aXN0ZW5lcnM7CisgICAgICAgIGNvbHVtblsib3JkaW5hbCJdID0gaW5zZXJ0aW9uSW5kZXg7Cisg ICAgICAgIGNvbHVtblsiY29sdW1uSWRlbnRpZmllciJdID0gY29sdW1uSWRlbnRpZmllcjsKIAot ICAgICAgICBjb2x1bW4uc2V0KCJsaXN0ZW5lcnMiLCBsaXN0ZW5lcnMpOwotICAgICAgICBjb2x1 bW4uc2V0KCJvcmRpbmFsIiwgaW5zZXJ0aW9uSW5kZXgpOwotICAgICAgICBjb2x1bW4uc2V0KCJj b2x1bW5JZGVudGlmaWVyIiwgY29sdW1uSWRlbnRpZmllcik7CiAgICAgICAgIHRoaXMub3JkZXJl ZENvbHVtbnMuc3BsaWNlKGluc2VydGlvbkluZGV4LCAwLCBjb2x1bW5JZGVudGlmaWVyKTsKIAog ICAgICAgICBmb3IgKHZhciBbaWRlbnRpZmllciwgZXhpc3RpbmdDb2x1bW5dIG9mIHRoaXMuY29s dW1ucykgewotICAgICAgICAgICAgdmFyIG9yZGluYWwgPSBleGlzdGluZ0NvbHVtbi5nZXQoIm9y ZGluYWwiKTsKKyAgICAgICAgICAgIHZhciBvcmRpbmFsID0gZXhpc3RpbmdDb2x1bW5bIm9yZGlu YWwiXTsKICAgICAgICAgICAgIGlmIChvcmRpbmFsID49IGluc2VydGlvbkluZGV4KSAvLyBBbHNv IGFkanVzdCB0aGUgIm9sZCIgY29sdW1uIGF0IGluc2VydGlvbiBpbmRleC4KLSAgICAgICAgICAg ICAgICBleGlzdGluZ0NvbHVtbi5zZXQoIm9yZGluYWwiLCBvcmRpbmFsICsgMSk7CisgICAgICAg ICAgICAgICAgZXhpc3RpbmdDb2x1bW5bIm9yZGluYWwiXSA9IG9yZGluYWwgKyAxOwogICAgICAg ICB9CiAgICAgICAgIHRoaXMuY29sdW1ucy5zZXQoY29sdW1uSWRlbnRpZmllciwgY29sdW1uKTsK IAotICAgICAgICBpZiAoY29sdW1uLmhhcygiZGlzY2xvc3VyZSIpKQorICAgICAgICBpZiAoY29s dW1uWyJkaXNjbG9zdXJlIl0pCiAgICAgICAgICAgICB0aGlzLmRpc2Nsb3N1cmVDb2x1bW5JZGVu dGlmaWVyID0gY29sdW1uSWRlbnRpZmllcjsKIAogICAgICAgICB2YXIgaGVhZGVyQ29sdW1uRWxl bWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImNvbCIpOwotICAgICAgICBpZiAoY29sdW1u Lmhhcygid2lkdGgiKSkKLSAgICAgICAgICAgIGhlYWRlckNvbHVtbkVsZW1lbnQuc3R5bGUud2lk dGggPSBjb2x1bW4uZ2V0KCJ3aWR0aCIpOwotICAgICAgICBjb2x1bW4uc2V0KCJlbGVtZW50Iiwg aGVhZGVyQ29sdW1uRWxlbWVudCk7CisgICAgICAgIGlmIChjb2x1bW5bIndpZHRoIl0pCisgICAg ICAgICAgICBoZWFkZXJDb2x1bW5FbGVtZW50LnN0eWxlLndpZHRoID0gY29sdW1uWyJ3aWR0aCJd OworICAgICAgICBjb2x1bW5bImVsZW1lbnQiXSA9IGhlYWRlckNvbHVtbkVsZW1lbnQ7CiAgICAg ICAgIHZhciByZWZlcmVuY2VFbGVtZW50ID0gdGhpcy5faGVhZGVyVGFibGVDb2x1bW5Hcm91cEVs ZW1lbnQuY2hpbGRyZW5baW5zZXJ0aW9uSW5kZXhdOwogICAgICAgICB0aGlzLl9oZWFkZXJUYWJs ZUNvbHVtbkdyb3VwRWxlbWVudC5pbnNlcnRCZWZvcmUoaGVhZGVyQ29sdW1uRWxlbWVudCwgcmVm ZXJlbmNlRWxlbWVudCk7CiAKICAgICAgICAgdmFyIGhlYWRlckNlbGxFbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgidGgiKTsKICAgICAgICAgaGVhZGVyQ2VsbEVsZW1lbnQuY2xhc3NO YW1lID0gY29sdW1uSWRlbnRpZmllciArICItY29sdW1uIjsKICAgICAgICAgaGVhZGVyQ2VsbEVs ZW1lbnQuY29sdW1uSWRlbnRpZmllciA9IGNvbHVtbklkZW50aWZpZXI7Ci0gICAgICAgIGlmIChj b2x1bW4uaGFzKCJhbGlnbmVkIikpCi0gICAgICAgICAgICBoZWFkZXJDZWxsRWxlbWVudC5jbGFz c0xpc3QuYWRkKGNvbHVtbi5nZXQoImFsaWduZWQiKSk7CisgICAgICAgIGlmIChjb2x1bW5bImFs aWduZWQiXSkKKyAgICAgICAgICAgIGhlYWRlckNlbGxFbGVtZW50LmNsYXNzTGlzdC5hZGQoY29s dW1uWyJhbGlnbmVkIl0pOwogICAgICAgICB0aGlzLl9oZWFkZXJUYWJsZUNlbGxFbGVtZW50cy5z ZXQoY29sdW1uSWRlbnRpZmllciwgaGVhZGVyQ2VsbEVsZW1lbnQpOwogICAgICAgICB2YXIgcmVm ZXJlbmNlRWxlbWVudCA9IHRoaXMuX2hlYWRlclRhYmxlUm93RWxlbWVudC5jaGlsZHJlbltpbnNl cnRpb25JbmRleF07CiAgICAgICAgIHRoaXMuX2hlYWRlclRhYmxlUm93RWxlbWVudC5pbnNlcnRC ZWZvcmUoaGVhZGVyQ2VsbEVsZW1lbnQsIHJlZmVyZW5jZUVsZW1lbnQpOwogCiAgICAgICAgIHZh ciBkaXYgPSBoZWFkZXJDZWxsRWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2Iik7Ci0gICAgICAgIGlm IChjb2x1bW4uaGFzKCJ0aXRsZURPTUZyYWdtZW50IikpCi0gICAgICAgICAgICBkaXYuYXBwZW5k Q2hpbGQoY29sdW1uLmdldCgidGl0bGVET01GcmFnbWVudCIpKTsKKyAgICAgICAgaWYgKGNvbHVt blsidGl0bGVET01GcmFnbWVudCJdKQorICAgICAgICAgICAgZGl2LmFwcGVuZENoaWxkKGNvbHVt blsidGl0bGVET01GcmFnbWVudCJdKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgZGl2LnRl eHRDb250ZW50ID0gY29sdW1uLmdldCgidGl0bGUiLCAiIik7CisgICAgICAgICAgICBkaXYudGV4 dENvbnRlbnQgPSBjb2x1bW5bInRpdGxlIl0gfHwgIiI7CiAKLSAgICAgICAgaWYgKGNvbHVtbi5n ZXQoInNvcnRhYmxlIikpIHsKKyAgICAgICAgaWYgKGNvbHVtblsic29ydGFibGUiXSkgewogICAg ICAgICAgICAgbGlzdGVuZXJzLnJlZ2lzdGVyKGhlYWRlckNlbGxFbGVtZW50LCAiY2xpY2siLCB0 aGlzLl9oZWFkZXJDZWxsQ2xpY2tlZCk7CiAgICAgICAgICAgICBoZWFkZXJDZWxsRWxlbWVudC5j bGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0YWJsZUNvbHVtblN0eWxlQ2xh c3NOYW1lKTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChjb2x1bW4uaGFzKCJncm91cCIpKQot ICAgICAgICAgICAgaGVhZGVyQ2VsbEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiY29sdW1uLWdyb3Vw LSIgKyBjb2x1bW4uZ2V0KCJncm91cCIpKTsKKyAgICAgICAgaWYgKGNvbHVtblsiZ3JvdXAiXSkK KyAgICAgICAgICAgIGhlYWRlckNlbGxFbGVtZW50LmNsYXNzTGlzdC5hZGQoImNvbHVtbi1ncm91 cC0iICsgY29sdW1uWyJncm91cCJdKTsKIAotICAgICAgICBpZiAoY29sdW1uLmhhcygiY29sbGFw c2VzR3JvdXAiKSkgewotICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoY29sdW1uLmdldCgiZ3Jv dXAiKSAhPT0gY29sdW1uLmdldCgiY29sbGFwc2VzR3JvdXAiKSk7CisgICAgICAgIGlmIChjb2x1 bW5bImNvbGxhcHNlc0dyb3VwIl0pIHsKKyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGNvbHVt blsiZ3JvdXAiXSAhPT0gY29sdW1uWyJjb2xsYXBzZXNHcm91cCJdKTsKIAogICAgICAgICAgICAg dmFyIGRpdmlkZXJFbGVtZW50ID0gaGVhZGVyQ2VsbEVsZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIp OwogICAgICAgICAgICAgZGl2aWRlckVsZW1lbnQuY2xhc3NOYW1lID0gImRpdmlkZXIiOwpAQCAt NDgzLDcgKzQ4MSw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICBsaXN0ZW5lcnMucmVnaXN0ZXIoY29sbGFwc2VEaXYsICJtb3VzZW91dCIsIHRoaXMu X21vdXNlb3V0Q29sdW1uQ29sbGFwc2VyKTsKICAgICAgICAgICAgIGxpc3RlbmVycy5yZWdpc3Rl cihjb2xsYXBzZURpdiwgImNsaWNrIiwgdGhpcy5fY2xpY2tJbkNvbHVtbkNvbGxhcHNlcik7CiAK LSAgICAgICAgICAgIGhlYWRlckNlbGxFbGVtZW50LmNvbGxhcHNlc0dyb3VwID0gY29sdW1uLmdl dCgiY29sbGFwc2VzR3JvdXAiKTsKKyAgICAgICAgICAgIGhlYWRlckNlbGxFbGVtZW50LmNvbGxh cHNlc0dyb3VwID0gY29sdW1uWyJjb2xsYXBzZXNHcm91cCJdOwogICAgICAgICAgICAgaGVhZGVy Q2VsbEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiY29sbGFwc2VyIik7CiAgICAgICAgIH0KIApAQCAt NDkyLDE5ICs0OTAsMTkgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKICAg ICAgICAgdmFyIGRhdGFDb2x1bW5FbGVtZW50ID0gaGVhZGVyQ29sdW1uRWxlbWVudC5jbG9uZU5v ZGUoKTsKICAgICAgICAgdmFyIHJlZmVyZW5jZUVsZW1lbnQgPSB0aGlzLl9kYXRhVGFibGVDb2x1 bW5Hcm91cEVsZW1lbnQuY2hpbGRyZW5baW5zZXJ0aW9uSW5kZXhdOwogICAgICAgICB0aGlzLl9k YXRhVGFibGVDb2x1bW5Hcm91cEVsZW1lbnQuaW5zZXJ0QmVmb3JlKGRhdGFDb2x1bW5FbGVtZW50 LCByZWZlcmVuY2VFbGVtZW50KTsKLSAgICAgICAgY29sdW1uLnNldCgiYm9keUVsZW1lbnQiLCBk YXRhQ29sdW1uRWxlbWVudCk7CisgICAgICAgIGNvbHVtblsiYm9keUVsZW1lbnQiXSA9IGRhdGFD b2x1bW5FbGVtZW50OwogCiAgICAgICAgIHZhciBmaWxsZXJDZWxsRWxlbWVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoInRkIik7CiAgICAgICAgIGZpbGxlckNlbGxFbGVtZW50LmNsYXNzTmFt ZSA9IGNvbHVtbklkZW50aWZpZXIgKyAiLWNvbHVtbiI7CiAgICAgICAgIGZpbGxlckNlbGxFbGVt ZW50Ll9fY29sdW1uSWRlbnRpZmllciA9IGNvbHVtbklkZW50aWZpZXI7Ci0gICAgICAgIGlmIChj b2x1bW4uaGFzKCJncm91cCIpKQotICAgICAgICAgICAgZmlsbGVyQ2VsbEVsZW1lbnQuY2xhc3NM aXN0LmFkZCgiY29sdW1uLWdyb3VwLSIgKyBjb2x1bW4uZ2V0KCJncm91cCIpKTsKKyAgICAgICAg aWYgKGNvbHVtblsiZ3JvdXAiXSkKKyAgICAgICAgICAgIGZpbGxlckNlbGxFbGVtZW50LmNsYXNz TGlzdC5hZGQoImNvbHVtbi1ncm91cC0iICsgY29sdW1uWyJncm91cCJdKTsKICAgICAgICAgdmFy IHJlZmVyZW5jZUVsZW1lbnQgPSB0aGlzLl9maWxsZXJSb3dFbGVtZW50LmNoaWxkcmVuW2luc2Vy dGlvbkluZGV4XTsKICAgICAgICAgdGhpcy5fZmlsbGVyUm93RWxlbWVudC5pbnNlcnRCZWZvcmUo ZmlsbGVyQ2VsbEVsZW1lbnQsIHJlZmVyZW5jZUVsZW1lbnQpOwogCiAgICAgICAgIGxpc3RlbmVy cy5pbnN0YWxsKCk7CiAKLSAgICAgICAgaWYgKGNvbHVtbi5oYXMoImhpZGRlbiIpKQorICAgICAg ICBpZiAoY29sdW1uWyJoaWRkZW4iXSkKICAgICAgICAgICAgIHRoaXMuX2hpZGVDb2x1bW4oY29s dW1uSWRlbnRpZmllcik7CiAgICAgfSwKIApAQCAtNTE1LDE2ICs1MTMsMTYgQEAgV2ViSW5zcGVj dG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5jb2x1bW5zLmRlbGV0ZShj b2x1bW5JZGVudGlmaWVyKTsKICAgICAgICAgdGhpcy5vcmRlcmVkQ29sdW1ucy5zcGxpY2UodGhp cy5vcmRlcmVkQ29sdW1ucy5pbmRleE9mKGNvbHVtbklkZW50aWZpZXIpLCAxKTsKIAotICAgICAg ICB2YXIgcmVtb3ZlZE9yZGluYWwgPSByZW1vdmVkQ29sdW1uLmdldCgib3JkaW5hbCIpOworICAg ICAgICB2YXIgcmVtb3ZlZE9yZGluYWwgPSByZW1vdmVkQ29sdW1uWyJvcmRpbmFsIl07CiAgICAg ICAgIGZvciAodmFyIFtpZGVudGlmaWVyLCBjb2x1bW5dIG9mIHRoaXMuY29sdW1ucykgewotICAg ICAgICAgICAgdmFyIG9yZGluYWwgPSBjb2x1bW4uZ2V0KCJvcmRpbmFsIik7CisgICAgICAgICAg ICB2YXIgb3JkaW5hbCA9IGNvbHVtblsib3JkaW5hbCJdOwogICAgICAgICAgICAgaWYgKG9yZGlu YWwgPiByZW1vdmVkT3JkaW5hbCkKLSAgICAgICAgICAgICAgICBjb2x1bW4uc2V0KCJvcmRpbmFs Iiwgb3JkaW5hbCAtIDEpOworICAgICAgICAgICAgICAgIGNvbHVtblsib3JkaW5hbCJdID0gb3Jk aW5hbCAtIDE7CiAgICAgICAgIH0KIAotICAgICAgICByZW1vdmVkQ29sdW1uLmdldCgibGlzdGVu ZXJzIikudW5pbnN0YWxsKHRydWUpOworICAgICAgICByZW1vdmVkQ29sdW1uWyJsaXN0ZW5lcnMi XS51bmluc3RhbGwodHJ1ZSk7CiAKLSAgICAgICAgaWYgKHJlbW92ZWRDb2x1bW4uaGFzKCJkaXNj bG9zdXJlIikpCisgICAgICAgIGlmIChyZW1vdmVkQ29sdW1uWyJkaXNjbG9zdXJlIl0pCiAgICAg ICAgICAgICBkZWxldGUgdGhpcy5kaXNjbG9zdXJlQ29sdW1uSWRlbnRpZmllcjsKIAogICAgICAg ICBpZiAodGhpcy5zb3J0Q29sdW1uSWRlbnRpZmllciA9PT0gY29sdW1uSWRlbnRpZmllcikKQEAg LTU5OCw3ICs1OTYsNyBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlID0gewogICAg IHsKICAgICAgICAgdmFyIHJlc3VsdCA9IHt9OwogICAgICAgICBmb3IgKHZhciBbaWRlbnRpZmll ciwgY29sdW1uXSBvZiB0aGlzLmNvbHVtbnMpIHsKLSAgICAgICAgICAgIHZhciB3aWR0aCA9IHRo aXMuX2hlYWRlclRhYmxlQ29sdW1uR3JvdXBFbGVtZW50LmNoaWxkcmVuW2NvbHVtbi5nZXQoIm9y ZGluYWwiKV0uc3R5bGUud2lkdGg7CisgICAgICAgICAgICB2YXIgd2lkdGggPSB0aGlzLl9oZWFk ZXJUYWJsZUNvbHVtbkdyb3VwRWxlbWVudC5jaGlsZHJlbltjb2x1bW5bIm9yZGluYWwiXV0uc3R5 bGUud2lkdGg7CiAgICAgICAgICAgICByZXN1bHRbY29sdW1uSWRlbnRpZmllcl0gPSBwYXJzZUZs b2F0KHdpZHRoKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gcmVzdWx0OwpAQCAtNjA4LDcg KzYwNiw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgewogICAg ICAgICBmb3IgKHZhciBbaWRlbnRpZmllciwgY29sdW1uXSBvZiB0aGlzLmNvbHVtbnMpIHsKICAg ICAgICAgICAgIHZhciB3aWR0aCA9IChjb2x1bW5XaWR0aHNNYXBbaWRlbnRpZmllcl0gfHwgMCkg KyAiJSI7Ci0gICAgICAgICAgICB2YXIgb3JkaW5hbCA9IGNvbHVtbi5nZXQoIm9yZGluYWwiKTsK KyAgICAgICAgICAgIHZhciBvcmRpbmFsID0gY29sdW1uWyJvcmRpbmFsIl07CiAgICAgICAgICAg ICB0aGlzLl9oZWFkZXJUYWJsZUNvbHVtbkdyb3VwRWxlbWVudC5jaGlsZHJlbltvcmRpbmFsXS5z dHlsZS53aWR0aCA9IHdpZHRoOwogICAgICAgICAgICAgdGhpcy5fZGF0YVRhYmxlQ29sdW1uR3Jv dXBFbGVtZW50LmNoaWxkcmVuW29yZGluYWxdLnN0eWxlLndpZHRoID0gd2lkdGg7CiAgICAgICAg IH0KQEAgLTYxOCwyMCArNjE2LDIwIEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUg PSB7CiAKICAgICBfaXNDb2x1bW5WaXNpYmxlOiBmdW5jdGlvbihjb2x1bW5JZGVudGlmaWVyKQog ICAgIHsKLSAgICAgICAgcmV0dXJuICF0aGlzLmNvbHVtbnMuZ2V0KGNvbHVtbklkZW50aWZpZXIp LmhhcygiaGlkZGVuIik7CisgICAgICAgIHJldHVybiAhdGhpcy5jb2x1bW5zLmdldChjb2x1bW5J ZGVudGlmaWVyKVsiaGlkZGVuIl07CiAgICAgfSwKIAogICAgIF9zaG93Q29sdW1uOiBmdW5jdGlv bihjb2x1bW5JZGVudGlmaWVyKQogICAgIHsKLSAgICAgICAgdGhpcy5jb2x1bW5zLmdldChjb2x1 bW5JZGVudGlmaWVyKS5kZWxldGUoImhpZGRlbiIpOworICAgICAgICBkZWxldGUgdGhpcy5jb2x1 bW5zLmdldChjb2x1bW5JZGVudGlmaWVyKVsiaGlkZGVuIl07CiAgICAgfSwKIAogICAgIF9oaWRl Q29sdW1uOiBmdW5jdGlvbihjb2x1bW5JZGVudGlmaWVyKQogICAgIHsKICAgICAgICAgdmFyIGNv bHVtbiA9IHRoaXMuY29sdW1ucy5nZXQoY29sdW1uSWRlbnRpZmllcik7Ci0gICAgICAgIGNvbHVt bi5zZXQoImhpZGRlbiIsIHRydWUpOworICAgICAgICBjb2x1bW5bImhpZGRlbiJdID0gdHJ1ZTsK IAotICAgICAgICB2YXIgY29sdW1uRWxlbWVudCA9IGNvbHVtbi5nZXQoImVsZW1lbnQiKTsKKyAg ICAgICAgdmFyIGNvbHVtbkVsZW1lbnQgPSBjb2x1bW5bImVsZW1lbnQiXTsKICAgICAgICAgY29s dW1uRWxlbWVudC5zdHlsZS53aWR0aCA9IDA7CiAKICAgICAgICAgdGhpcy5fY29sdW1uV2lkdGhz SW5pdGlhbGl6ZWQgPSBmYWxzZTsKQEAgLTEwMjcsNyArMTAyNSw3IEBAIFdlYkluc3BlY3Rvci5E YXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB2YXIgY29sbGFwc2VyQ29sdW1u SWRlbnRpZmllciA9IG51bGw7CiAgICAgICAgIGZvciAodmFyIFtpZGVudGlmaWVyLCBjb2x1bW5d IG9mIHRoaXMuY29sdW1ucykgewotICAgICAgICAgICAgaWYgKGNvbHVtbi5nZXQoImNvbGxhcHNl c0dyb3VwIikgPT0gY29sdW1uR3JvdXApIHsKKyAgICAgICAgICAgIGlmIChjb2x1bW5bImNvbGxh cHNlc0dyb3VwIl0gPT0gY29sdW1uR3JvdXApIHsKICAgICAgICAgICAgICAgICBjb2xsYXBzZXJD b2x1bW5JZGVudGlmaWVyID0gaWRlbnRpZmllcjsKICAgICAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgICAgIH0KQEAgLTEwNDksNyArMTA0Nyw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5w cm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIHNob3dPckhpZGUgPSBjb2x1bW5zV2lsbENvbGxh cHNlID8gdGhpcy5faGlkZUNvbHVtbiA6IHRoaXMuX3Nob3dDb2x1bW47CiAgICAgICAgIGZvciAo dmFyIFtpZGVudGlmaWVyLCBjb2x1bW5dIG9mIHRoaXMuY29sdW1ucykgewotICAgICAgICAgICAg aWYgKGNvbHVtbi5nZXQoImdyb3VwIikgPT09IGNlbGwuY29sbGFwc2VzR3JvdXApCisgICAgICAg ICAgICBpZiAoY29sdW1uWyJncm91cCJdID09PSBjZWxsLmNvbGxhcHNlc0dyb3VwKQogICAgICAg ICAgICAgICAgIHNob3dPckhpZGUuY2FsbCh0aGlzLCBpZGVudGlmaWVyKTsKICAgICAgICAgfQog CkBAIC0xNTU0LDExICsxNTUyLDExIEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUucHJvdG90 eXBlID0gewogCiAgICAgICAgIHZhciBjb2x1bW4gPSB0aGlzLmRhdGFHcmlkLmNvbHVtbnMuZ2V0 KGNvbHVtbklkZW50aWZpZXIpOwogCi0gICAgICAgIGlmIChjb2x1bW4uaGFzKCJhbGlnbmVkIikp Ci0gICAgICAgICAgICBjZWxsRWxlbWVudC5jbGFzc0xpc3QuYWRkKGNvbHVtbi5nZXQoImFsaWdu ZWQiKSk7CisgICAgICAgIGlmIChjb2x1bW5bImFsaWduZWQiXSkKKyAgICAgICAgICAgIGNlbGxF bGVtZW50LmNsYXNzTGlzdC5hZGQoY29sdW1uWyJhbGlnbmVkIl0pOwogCi0gICAgICAgIGlmIChj b2x1bW4uaGFzKCJncm91cCIpKQotICAgICAgICAgICAgY2VsbEVsZW1lbnQuY2xhc3NMaXN0LmFk ZCgiY29sdW1uLWdyb3VwLSIgKyBjb2x1bW4uZ2V0KCJncm91cCIpKTsKKyAgICAgICAgaWYgKGNv bHVtblsiZ3JvdXAiXSkKKyAgICAgICAgICAgIGNlbGxFbGVtZW50LmNsYXNzTGlzdC5hZGQoImNv bHVtbi1ncm91cC0iICsgY29sdW1uWyJncm91cCJdKTsKIAogICAgICAgICB2YXIgZGl2ID0gY2Vs bEVsZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIpOwogICAgICAgICB2YXIgY29udGVudCA9IHRoaXMu Y3JlYXRlQ2VsbENvbnRlbnQoY29sdW1uSWRlbnRpZmllciwgY2VsbEVsZW1lbnQpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXRE YXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1By b2JlU2V0RGF0YUdyaWQuanMKaW5kZXggODUxNDFhNTdjNzg3MzAwMmUxOTE0OWZmOWI4MGVjOTMw OWY1NWU0Mi4uMjQwODFiYzFkMDQwMTllYjk4ZjA3OWMyMTY0MDYzODQ0MGI5YmJjZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXRE YXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Qcm9iZVNldERhdGFHcmlkLmpzCkBAIC0xODIsNyArMTgyLDcgQEAgV2ViSW5zcGVjdG9yLlBy b2JlU2V0RGF0YUdyaWQucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBvbGRDb2x1bW4gPSB0 aGlzLmNvbHVtbnMuZ2V0KHByb2JlLmlkKTsKICAgICAgICAgdGhpcy5yZW1vdmVDb2x1bW4ocHJv YmUuaWQpOwotICAgICAgICB2YXIgb3JkaW5hbCA9IG9sZENvbHVtbi5nZXQoIm9yZGluYWwiKTsK KyAgICAgICAgdmFyIG9yZGluYWwgPSBvbGRDb2x1bW5bIm9yZGluYWwiXTsKICAgICAgICAgdmFy IG5ld0NvbHVtbiA9IHt0aXRsZTogZXZlbnQuZGF0YS5uZXdWYWx1ZX07CiAgICAgICAgIHRoaXMu aW5zZXJ0Q29sdW1uKHByb2JlLmlkLCBuZXdDb2x1bW4sIG9yZGluYWwpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFH cmlkLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxp bmVEYXRhR3JpZC5qcwppbmRleCAzOWZiN2VhNzEzZTUwY2NlYTUwYmMxMGVkZjY1MmU5NzdiYWU1 OTQ2Li5jMjIxOTlhYThlMDhkNjQ0MTQ1NjVhYjc4YTNhOGY5ZWExNmY1NGFlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFH cmlkLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lRGF0YUdyaWQuanMKQEAgLTM0LDggKzM0LDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l RGF0YUdyaWQgPSBmdW5jdGlvbih0cmVlT3V0bGluZSwgY29sdW1ucywgZGVsZWdhdGUsIGVkaXRD YWwKICAgICB0aGlzLl9maWx0ZXJhYmxlQ29sdW1ucyA9IFtdOwogCiAgICAgLy8gQ2hlY2sgaWYg YW55IG9mIHRoZSBjZWxscyBjYW4gYmUgZmlsdGVyZWQuCi0gICAgZm9yICh2YXIgaWRlbnRpZmll ciBpbiBjb2x1bW5zKSB7Ci0gICAgICAgIHZhciBzY29wZUJhciA9IGNvbHVtbnNbaWRlbnRpZmll cl0uc2NvcGVCYXI7CisgICAgZm9yICh2YXIgW2lkZW50aWZpZXIsIGNvbHVtbl0gb2YgdGhpcy5j b2x1bW5zKSB7CisgICAgICAgIHZhciBzY29wZUJhciA9IGNvbHVtbnNbInNjb3BlQmFyIl07CiAg ICAgICAgIGlmICghc2NvcGVCYXIpCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgdGhp cy5fZmlsdGVyYWJsZUNvbHVtbnMucHVzaChpZGVudGlmaWVyKTsKQEAgLTQ5LDcgKzQ5LDcgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQgPSBmdW5jdGlvbih0cmVlT3V0bGluZSwgY29s dW1ucywgZGVsZWdhdGUsIGVkaXRDYWwKICAgICB9CiAKICAgICBpZiAodGhpcy5fZmlsdGVyYWJs ZUNvbHVtbnMubGVuZ3RoKSB7Ci0gICAgICAgIHZhciBpdGVtcyA9IFtuZXcgV2ViSW5zcGVjdG9y LkZsZXhpYmxlU3BhY2VOYXZpZ2F0aW9uSXRlbSwgdGhpcy5jb2x1bW5zLmdldCh0aGlzLl9maWx0 ZXJhYmxlQ29sdW1uc1swXSkuZ2V0KCJzY29wZUJhciIpLCBuZXcgV2ViSW5zcGVjdG9yLkZsZXhp YmxlU3BhY2VOYXZpZ2F0aW9uSXRlbV07CisgICAgICAgIHZhciBpdGVtcyA9IFtuZXcgV2ViSW5z cGVjdG9yLkZsZXhpYmxlU3BhY2VOYXZpZ2F0aW9uSXRlbSwgdGhpcy5jb2x1bW5zLmdldCh0aGlz Ll9maWx0ZXJhYmxlQ29sdW1uc1swXSlbInNjb3BlQmFyIl0sIG5ldyBXZWJJbnNwZWN0b3IuRmxl eGlibGVTcGFjZU5hdmlnYXRpb25JdGVtXTsKICAgICAgICAgdGhpcy5fbmF2aWdhdGlvbkJhciA9 IG5ldyBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvbkJhcihudWxsLCBpdGVtcyk7CiAgICAgICAgIHZh ciBjb250YWluZXIgPSB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2IikpOwogICAgICAgICBjb250YWluZXIuY2xhc3NOYW1lID0gIm5hdmlnYXRpb24t YmFyLWNvbnRhaW5lciI7CkBAIC0xNDksNyArMTQ5LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l RGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICBjb25zb2xlLmFzc2VydChkYXRhR3JpZE5v ZGUpOwogCiAgICAgICAgIGZvciAodmFyIGlkZW50aWZpZXIgb2YgdGhpcy5fZmlsdGVyYWJsZUNv bHVtbnMpIHsKLSAgICAgICAgICAgIHZhciBzY29wZUJhciA9IHRoaXMuY29sdW1ucy5nZXQoaWRl bnRpZmllcikuZ2V0KCJzY29wZUJhciIpOworICAgICAgICAgICAgdmFyIHNjb3BlQmFyID0gdGhp cy5jb2x1bW5zLmdldChpZGVudGlmaWVyKVsic2NvcGVCYXIiXTsKICAgICAgICAgICAgIGlmICgh c2NvcGVCYXIgfHwgc2NvcGVCYXIuZGVmYXVsdEl0ZW0uc2VsZWN0ZWQpCiAgICAgICAgICAgICAg ICAgY29udGludWU7CiAK