138994 2014-11-21 19:25:26 -0800 The dashboard on new perf monitor should be configurable 2014-11-21 19:42:14 -0800 1 1 1 Unclassified WebKit WebKit Website 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 138516 1 rniwa rniwa benjamin kling oldest_to_newest 1050665 0 rniwa 2014-11-21 19:25:26 -0800 Don't hard code the table in the code. 1050669 1 242100 rniwa 2014-11-21 19:34:24 -0800 Created attachment 242100 Patch 1050670 2 242101 rniwa 2014-11-21 19:35:57 -0800 Created attachment 242101 Reverted an irrelevant change 1050671 3 242101 rniwa 2014-11-21 19:42:10 -0800 Comment on attachment 242101 Reverted an irrelevant change Clearing flags on attachment: 242101 Committed r176497: <http://trac.webkit.org/changeset/176497> 1050672 4 rniwa 2014-11-21 19:42:14 -0800 All reviewed patches have been landed. Closing bug. 242100 2014-11-21 19:34:24 -0800 2014-11-21 19:35:54 -0800 Patch bug-138994-20141121193440.patch text/plain 9894 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NDM1CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCAzYzk4OGU4ZjAwZTZmY2I2N2ZjMmVkZDZjYmMzYmUxOGJjNzA4MTJiLi5hYzM3ZmYzNWJh YTE2NDhmNjNlNmI4MTE1ZGQyNTlhMGRjNTJjMGZiIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxNC0xMS0yMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KKworICAgICAgICBUaGUgZGFzaGJvYXJkIG9uIG5ldyBwZXJmIG1vbml0b3Ig c2hvdWxkIGJlIGNvbmZpZ3VyYWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM4OTk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRm9yIG5vdywgbWFrZSBpdCBjb25maWd1cmFibGUgdmlhIGNvbmZpZy5q c29uLiBXZSBzaG91bGQgZXZlbnR1YWxseSBtYWtlIGl0IGNvbmZpZ3VyYWJsZSB2aWEKKyAgICAg ICAgYW4gYWRtaW5pc3RyYXRpdmUgcGFnZSBidXQgdGhpcyB3aWxsIGRvIGZvciBub3cuCisKKyAg ICAgICAgKiBjb25maWcuanNvbjogQWRkZWQgdGhlIGVtcHR5IGRhc2hib2FyZCBjb25maWd1cmF0 aW9uLgorCisgICAgICAgICogcHVibGljL2luY2x1ZGUvbWFuaWZlc3QucGhwOiBJbmNsdWRlIHRo ZSBkYXNoYm9hcmQgY29uZmlndXJhdGlvbiBpbiB0aGUgbWFuaWZlc3QgZmlsZS4KKworICAgICAg ICAqIHB1YmxpYy92Mi9hcHAuanM6CisgICAgICAgIChBcHAuSW5kZXhDb250cm9sbGVyKTogUmVt b3ZlZCBkZWZhdWx0VGFibGUgc2luY2UgdGhpcyBpcyBub3cgZHluYW1pY2FsbHkgb2J0YWluZWQg dmlhIEFwcC5NYW5pZmVzdC4KKyAgICAgICAgKEFwcC5JbmRleENvbnRyb2xsZXIuZ3JpZENoYW5n ZWQpOiBVc2UgQXBwLkRhc2hib2FyZCB0byBwYXJzZSB0aGUgZGFzaGJvYXJkIGNvbmZpZ3VyYXRp b24uCisgICAgICAgIEFsc28gb2J0YWluIHRoZSBkZWZhdWx0IGNvbmZpZ3VyYXRpb24gZnJvbSBB cHAuTWFuaWZlc3QuCisgICAgICAgIChBcHAuSW5kZXhDb250cm9sbGVyLl9ub3JtYWxpemVUYWJs ZSk6IE1vdmVkIHRvIEFwcC5EYXNoYm9hcmQuCisKKyAgICAgICAgKiBwdWJsaWMvdjIvbWFuaWZl c3QuanM6CisgICAgICAgIChBcHAuUmVwb3NpdG9yeS51cmxGb3JSZXZpc2lvbik6IEZpeGVkIHRo ZSBwb3NpdGlvbiBvZiB0aGUgb3BlbiBjdXJseSBicmFja2V0LgorICAgICAgICAoQXBwLlJlcG9z aXRvcnkudXJsRm9yUmV2aXNpb25SYW5nZSk6IERpdHRvLgorICAgICAgICAoQXBwLkRhc2hib2Fy ZCk6IEFkZGVkLgorICAgICAgICAoQXBwLkRhc2hib2FyZC50YWJsZSk6IEV4dHJhY3RlZCBmcm9t IEFwcC5JbmRleENvbnRyb2xsZXIuZ3JpZENoYW5nZWQuCisgICAgICAgIChBcHAuRGFzaGJvYXJk LnJvd3MpOiBEaXR0by4KKyAgICAgICAgKEFwcC5EYXNoYm9hcmQuaGVhZGVyQ29sdW1ucyk6IERp dHRvLgorICAgICAgICAoQXBwLkRhc2hib2FyZC5fbm9ybWFsaXplVGFibGUpOiBNb3ZlZCBmcm9t IEFwcC5JbmRleENvbnRyb2xsZXIuX25vcm1hbGl6ZVRhYmxlLgorICAgICAgICAoQXBwLk1ldHJp Y1NlcmlhbGl6ZXIubm9ybWFsaXplUGF5bG9hZCk6IFN5bnRoZXNpemUgYSBkYXNoYm9hcmQgcmVj b3JkIGZyb20gdGhlIGNvbmZpZ3VyYXRpb24uCisgICAgICAgIFNpbmNlIHRoZXJlIGlzIGV4YWN0 bHkgb25lIGRhc2hib2FyZCBvYmplY3QgcGVyIGFwcCwgaXQncyBva2F5IHRvIGhhcmQgY29kZSBh biBpZCBoZXJlLgorICAgICAgICAoQXBwLk1hbmlmZXN0Ll9mZXRjaGVkTWFuaWZlc3QpOiBTZXQg ZGVmYXVsdERhc2hib2FyZCB0byB0aGUgb25lIGFuZCBvbmx5IG9uZSBkYXNoYm9hcmQgd2UgaGF2 ZS4KKwogMjAxNC0xMS0yMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAg ICAgICBGaXggbWlzYyBidWdzIGFuZCB0eXBvcyBpbiBhcHAuanMKZGlmZiAtLWdpdCBhL1dlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy9jb25maWcuanNvbiBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy9jb25maWcuanNvbgppbmRleCA0ODY2NjRmYjNhOTBkYjljZDFiNDQ2MjY2ZmU1YTkyNTU3ZTE1 NTJjLi4zYmIzZTBjNjQyZmY4YzZlNjQxZTRlZWY0MzRjZTA5YWEzNzk3YWU0IDEwMDY0NAotLS0g YS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvY29uZmlnLmpzb24KKysrIGIvV2Vic2l0ZXMvcGVy Zi53ZWJraXQub3JnL2NvbmZpZy5qc29uCkBAIC0xMiw1ICsxMiw2IEBACiAgICAgInRlc3RTZXJ2 ZXIiOiB7CiAgICAgICAgICJob3N0bmFtZSI6ICJsb2NhbGhvc3QiLAogICAgICAgICAicG9ydCI6 IDgwCi0gICAgfQorICAgIH0sCisgICAgImRlZmF1bHREYXNoYm9hcmQiOiBbW11dCiB9CmRpZmYg LS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUvbWFuaWZlc3Qu cGhwIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9pbmNsdWRlL21hbmlmZXN0LnBo cAppbmRleCA0Njc4ZTk1ZGJhOGEwNzQ4NmE5OGFiN2I4M2RlNDM3MDI4OWMxNTAwLi41MTZjZjk3 NDM1ZTQ3ZDQxNzA2YjIyYTY0NTQ2NDQ3OGIzY2QxMTY3IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUvbWFuaWZlc3QucGhwCisrKyBiL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvaW5jbHVkZS9tYW5pZmVzdC5waHAKQEAgLTMyLDYgKzMy LDcgQEAgY2xhc3MgTWFuaWZlc3RHZW5lcmF0b3IgewogICAgICAgICAgICAgJ3JlcG9zaXRvcmll cycgPT4gJHRoaXMtPnJlcG9zaXRvcmllcygkcmVwb3NpdG9yaWVzX3RhYmxlLCAkcmVwb3NpdG9y aWVzX3dpdGhfY29tbWl0KSwKICAgICAgICAgICAgICdidWlsZGVycycgPT4gJHRoaXMtPmJ1aWxk ZXJzKCksCiAgICAgICAgICAgICAnYnVnVHJhY2tlcnMnID0+ICR0aGlzLT5idWdfdHJhY2tlcnMo JHJlcG9zaXRvcmllc190YWJsZSksCisgICAgICAgICAgICAnZGVmYXVsdERhc2hib2FyZCcgPT4g Y29uZmlnKCdkZWZhdWx0RGFzaGJvYXJkJyksCiAgICAgICAgICk7CiAgICAgICAgIHJldHVybiAk dGhpcy0+bWFuaWZlc3Q7CiAgICAgfQpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3B1YmxpYy92Mi9hcHAuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3Yy L2FwcC5qcwppbmRleCBiZWM1MGExNTYwMDE2NjY2YmU1YzgzNDk1YTQ3YjFlYWFlODIyMDhlLi5k OGE4MmIzNmRiMjMwNDI0NGYyYjRmYTc1YmFmMjNjNjQwMzIwN2U1IDEwMDc1NQotLS0gYS9XZWJz aXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL2FwcC5qcworKysgYi9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvcHVibGljL3YyL2FwcC5qcwpAQCAtNTcsNyArNTcsNiBAQCBBcHAuRGFzaGJv YXJkUGFuZVByb3h5Rm9yUGlja2VyID0gRW1iZXIuT2JqZWN0UHJveHkuZXh0ZW5kKHsKIEFwcC5J bmRleENvbnRyb2xsZXIgPSBFbWJlci5Db250cm9sbGVyLmV4dGVuZCh7CiAgICAgcXVlcnlQYXJh bXM6IFsnZ3JpZCcsICdudW1iZXJPZkRheXMnXSwKICAgICBfcHJldmlvdXNHcmlkOiB7fSwKLSAg ICBkZWZhdWx0VGFibGU6IFtdLAogICAgIGhlYWRlckNvbHVtbnM6IFtdLAogICAgIHJvd3M6IFtd LAogICAgIG51bWJlck9mRGF5czogMzAsCkBAIC02OSwyNyArNjgsMjQgQEAgQXBwLkluZGV4Q29u dHJvbGxlciA9IEVtYmVyLkNvbnRyb2xsZXIuZXh0ZW5kKHsKICAgICAgICAgaWYgKGdyaWQgPT09 IHRoaXMuX3ByZXZpb3VzR3JpZCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB2YXIg dGFibGUgPSBudWxsOwotICAgICAgICB0cnkgewotICAgICAgICAgICAgaWYgKGdyaWQpCi0gICAg ICAgICAgICAgICAgdGFibGUgPSBKU09OLnBhcnNlKGdyaWQpOwotICAgICAgICB9IGNhdGNoIChl cnJvcikgewotICAgICAgICAgICAgY29uc29sZS5sb2coIkZhaWxlZCB0byBwYXJzZSB0aGUgZ3Jp ZDoiLCBlcnJvciwgZ3JpZCk7CisgICAgICAgIHZhciBkYXNoYm9hcmQgPSBudWxsOworICAgICAg ICBpZiAoZ3JpZCkgeworICAgICAgICAgICAgZGFzaGJvYXJkID0gQXBwLkRhc2hib2FyZC5jcmVh dGUoe3NlcmlhbGl6ZWQ6IGdyaWR9KTsKKyAgICAgICAgICAgIGlmICghZGFzaGJvYXJkLmdldCgn aGVhZGVyQ29sdW1ucycpLmxlbmd0aCkKKyAgICAgICAgICAgICAgICBkYXNoYm9hcmQgPSBudWxs OwogICAgICAgICB9CisgICAgICAgIGlmICghZGFzaGJvYXJkKQorICAgICAgICAgICAgZGFzaGJv YXJkID0gQXBwLk1hbmlmZXN0LmdldCgnZGVmYXVsdERhc2hib2FyZCcpOworICAgICAgICBpZiAo IWRhc2hib2FyZCkKKyAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAoIXRhYmxlIHx8 ICF0YWJsZS5sZW5ndGgpIC8vIEZJWE1FOiBXZSBzaG91bGQgZmV0Y2ggdGhpcyBmcm9tIHRoZSBt YW5pZmVzdC4KLSAgICAgICAgICAgIHRhYmxlID0gdGhpcy5nZXQoJ2RlZmF1bHRUYWJsZScpOwot Ci0gICAgICAgIHRhYmxlID0gdGhpcy5fbm9ybWFsaXplVGFibGUodGFibGUpOwotICAgICAgICB2 YXIgY29sdW1uQ291bnQgPSB0YWJsZVswXS5sZW5ndGg7CisgICAgICAgIHZhciBoZWFkZXJDb2x1 bW5zID0gZGFzaGJvYXJkLmdldCgnaGVhZGVyQ29sdW1ucycpOworICAgICAgICB0aGlzLnNldCgn aGVhZGVyQ29sdW1ucycsIGhlYWRlckNvbHVtbnMpOworICAgICAgICB2YXIgY29sdW1uQ291bnQg PSBoZWFkZXJDb2x1bW5zLmxlbmd0aDsKICAgICAgICAgdGhpcy5zZXQoJ2NvbHVtbkNvdW50Jywg Y29sdW1uQ291bnQpOwogCi0gICAgICAgIHRoaXMuc2V0KCdoZWFkZXJDb2x1bW5zJywgdGFibGVb MF0ubWFwKGZ1bmN0aW9uIChuYW1lLCBpbmRleCkgewotICAgICAgICAgICAgcmV0dXJuIHtsYWJl bDpuYW1lLCBpbmRleDogaW5kZXh9OwotICAgICAgICB9KSk7Ci0KICAgICAgICAgdmFyIHN0b3Jl ID0gdGhpcy5zdG9yZTsKLSAgICAgICAgdGhpcy5zZXQoJ3Jvd3MnLCB0YWJsZS5zbGljZSgxKS5t YXAoZnVuY3Rpb24gKHJvd1BhcmFtKSB7CisgICAgICAgIHRoaXMuc2V0KCdyb3dzJywgZGFzaGJv YXJkLmdldCgncm93cycpLm1hcChmdW5jdGlvbiAocm93UGFyYW0pIHsKICAgICAgICAgICAgIHJl dHVybiBBcHAuRGFzaGJvYXJkUm93LmNyZWF0ZSh7CiAgICAgICAgICAgICAgICAgc3RvcmU6IHN0 b3JlLAogICAgICAgICAgICAgICAgIGhlYWRlcjogcm93UGFyYW1bMF0sCkBAIC05OSwyMiArOTUs NyBAQCBBcHAuSW5kZXhDb250cm9sbGVyID0gRW1iZXIuQ29udHJvbGxlci5leHRlbmQoewogICAg ICAgICB9KSk7CiAKICAgICAgICAgdGhpcy5zZXQoJ2VtcHR5Um93JywgbmV3IEFycmF5KGNvbHVt bkNvdW50KSk7Ci0gICAgfS5vYnNlcnZlcygnZ3JpZCcpLm9uKCdpbml0JyksCi0KLSAgICBfbm9y bWFsaXplVGFibGU6IGZ1bmN0aW9uICh0YWJsZSkKLSAgICB7Ci0gICAgICAgIHZhciBtYXhDb2x1 bW5Db3VudCA9IE1hdGgubWF4KHRhYmxlLm1hcChmdW5jdGlvbiAoY29sdW1uKSB7IHJldHVybiBj b2x1bW4ubGVuZ3RoOyB9KSk7Ci0gICAgICAgIGZvciAodmFyIGkgPSAxOyBpIDwgdGFibGUubGVu Z3RoOyBpKyspIHsKLSAgICAgICAgICAgIHZhciByb3cgPSB0YWJsZVtpXTsKLSAgICAgICAgICAg IGZvciAodmFyIGogPSAxOyBqIDwgcm93Lmxlbmd0aDsgaisrKSB7Ci0gICAgICAgICAgICAgICAg aWYgKHJvd1tqXSAmJiAhKHJvd1tqXSBpbnN0YW5jZW9mIEFycmF5KSkgewotICAgICAgICAgICAg ICAgICAgICBjb25zb2xlLmxvZygnVW5yZWNvZ25pemVkIChwbGF0Zm9ybSwgbWV0cmljKSBwYWly IGF0IGNvbHVtbiAnICsgaSArICcgcm93ICcgKyBqICsgJzonICsgcm93W2pdKTsKLSAgICAgICAg ICAgICAgICAgICAgcm93W2pdID0gW107Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAg fQotICAgICAgICB9Ci0gICAgICAgIHJldHVybiB0YWJsZTsKLSAgICB9LAorICAgIH0ub2JzZXJ2 ZXMoJ2dyaWQnLCAnQXBwLk1hbmlmZXN0LmRlZmF1bHREYXNoYm9hcmQnKS5vbignaW5pdCcpLAog CiAgICAgdXBkYXRlR3JpZDogZnVuY3Rpb24oKQogICAgIHsKZGlmZiAtLWdpdCBhL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvbWFuaWZlc3QuanMgYi9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvcHVibGljL3YyL21hbmlmZXN0LmpzCmluZGV4IDdjY2EwMDlmZWY5MGE4NTJlNzgx Mzg4MWE1NGViNmFiM2NjOTRhYWYuLjMzMzQ4OGE1Yjk4MjZjZmI2MGJiYjEzZDE2M2FkMmI4OTJh NjlhODcgMTAwNzU1Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvbWFu aWZlc3QuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9tYW5pZmVz dC5qcwpAQCAtODAsMTQgKzgwLDYzIEBAIEFwcC5SZXBvc2l0b3J5ID0gQXBwLk5hbWVMYWJlbE1v ZGVsLmV4dGVuZCh7CiAgICAgdXJsOiBEUy5hdHRyKCdzdHJpbmcnKSwKICAgICBibGFtZVVybDog RFMuYXR0cignc3RyaW5nJyksCiAgICAgaGFzUmVwb3J0ZWRDb21taXRzOiBEUy5hdHRyKCdib29s ZWFuJyksCi0gICAgdXJsRm9yUmV2aXNpb246IGZ1bmN0aW9uIChjdXJyZW50UmV2aXNpb24pIHsK KyAgICB1cmxGb3JSZXZpc2lvbjogZnVuY3Rpb24gKGN1cnJlbnRSZXZpc2lvbikKKyAgICB7CiAg ICAgICAgIHJldHVybiAodGhpcy5nZXQoJ3VybCcpIHx8ICcnKS5yZXBsYWNlKC9cJDEvZywgY3Vy cmVudFJldmlzaW9uKTsKICAgICB9LAotICAgIHVybEZvclJldmlzaW9uUmFuZ2U6IGZ1bmN0aW9u IChmcm9tLCB0bykgeworICAgIHVybEZvclJldmlzaW9uUmFuZ2U6IGZ1bmN0aW9uIChmcm9tLCB0 bykKKyAgICB7CiAgICAgICAgIHJldHVybiAodGhpcy5nZXQoJ2JsYW1lVXJsJykgfHwgJycpLnJl cGxhY2UoL1wkMS9nLCBmcm9tKS5yZXBsYWNlKC9cJDIvZywgdG8pOwogICAgIH0sCiB9KTsKIAor QXBwLkRhc2hib2FyZCA9IEFwcC5Nb2RlbC5leHRlbmQoeworICAgIHNlcmlhbGl6ZWQ6IERTLmF0 dHIoJ3N0cmluZycpLAorICAgIHRhYmxlOiBmdW5jdGlvbiAoKQorICAgIHsKKyAgICAgICAgdmFy IGpzb24gPSB0aGlzLmdldCgnc2VyaWFsaXplZCcpOworICAgICAgICB0cnkgeworICAgICAgICAg ICAgdmFyIHBhcnNlZCA9IEpTT04ucGFyc2UoanNvbik7CisgICAgICAgIH0gY2F0Y2ggKGVycm9y KSB7CisgICAgICAgICAgICBjb25zb2xlLmxvZygiRmFpbGVkIHRvIHBhcnNlIHRoZSBncmlkOiIs IGVycm9yLCBqc29uKTsKKyAgICAgICAgICAgIHJldHVybiBbXTsKKyAgICAgICAgfQorICAgICAg ICBpZiAoIXBhcnNlZCkKKyAgICAgICAgICAgIHJldHVybiBbXTsKKyAgICAgICAgcmV0dXJuIHRo aXMuX25vcm1hbGl6ZVRhYmxlKHBhcnNlZCk7CisgICAgfS5wcm9wZXJ0eSgnc2VyaWFsaXplZCcp LAorCisgICAgcm93czogZnVuY3Rpb24gKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLmdl dCgndGFibGUnKS5zbGljZSgxKTsKKyAgICB9LnByb3BlcnR5KCd0YWJsZScpLAorCisgICAgaGVh ZGVyQ29sdW1uczogZnVuY3Rpb24gKCkKKyAgICB7CisgICAgICAgIHZhciB0YWJsZSA9IHRoaXMu Z2V0KCd0YWJsZScpOworICAgICAgICBpZiAoIXRhYmxlIHx8ICF0YWJsZS5sZW5ndGgpCisgICAg ICAgICAgICByZXR1cm4gW107CisgICAgICAgIHJldHVybiB0YWJsZVswXS5tYXAoZnVuY3Rpb24g KG5hbWUsIGluZGV4KSB7CisgICAgICAgICAgICByZXR1cm4ge2xhYmVsOm5hbWUsIGluZGV4OiBp bmRleH07CisgICAgICAgIH0pOworICAgIH0ucHJvcGVydHkoJ3RhYmxlJyksCisKKyAgICBfbm9y bWFsaXplVGFibGU6IGZ1bmN0aW9uICh0YWJsZSkKKyAgICB7CisgICAgICAgIHZhciBtYXhDb2x1 bW5Db3VudCA9IE1hdGgubWF4KHRhYmxlLm1hcChmdW5jdGlvbiAoY29sdW1uKSB7IHJldHVybiBj b2x1bW4ubGVuZ3RoOyB9KSk7CisgICAgICAgIGZvciAodmFyIGkgPSAxOyBpIDwgdGFibGUubGVu Z3RoOyBpKyspIHsKKyAgICAgICAgICAgIHZhciByb3cgPSB0YWJsZVtpXTsKKyAgICAgICAgICAg IGZvciAodmFyIGogPSAxOyBqIDwgcm93Lmxlbmd0aDsgaisrKSB7CisgICAgICAgICAgICAgICAg aWYgKHJvd1tqXSAmJiAhKHJvd1tqXSBpbnN0YW5jZW9mIEFycmF5KSkgeworICAgICAgICAgICAg ICAgICAgICBjb25zb2xlLmxvZygnVW5yZWNvZ25pemVkIChwbGF0Zm9ybSwgbWV0cmljKSBwYWly IGF0IGNvbHVtbiAnICsgaSArICcgcm93ICcgKyBqICsgJzonICsgcm93W2pdKTsKKyAgICAgICAg ICAgICAgICAgICAgcm93W2pdID0gW107CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg fQorICAgICAgICB9CisgICAgICAgIHJldHVybiB0YWJsZTsKKyAgICB9LAorfSk7CisKIEFwcC5N ZXRyaWNTZXJpYWxpemVyID0gQXBwLlBsYXRmb3JtU2VyaWFsaXplciA9IERTLlJFU1RTZXJpYWxp emVyLmV4dGVuZCh7CiAgICAgbm9ybWFsaXplUGF5bG9hZDogZnVuY3Rpb24gKHBheWxvYWQpCiAg ICAgewpAQCAtMTAxLDYgKzE1MCw3IEBAIEFwcC5NZXRyaWNTZXJpYWxpemVyID0gQXBwLlBsYXRm b3JtU2VyaWFsaXplciA9IERTLlJFU1RTZXJpYWxpemVyLmV4dGVuZCh7CiAgICAgICAgICAgICBt ZXRyaWNzOiB0aGlzLl9ub3JtYWxpemVJZE1hcChwYXlsb2FkWydtZXRyaWNzJ10pLAogICAgICAg ICAgICAgcmVwb3NpdG9yaWVzOiB0aGlzLl9ub3JtYWxpemVJZE1hcChwYXlsb2FkWydyZXBvc2l0 b3JpZXMnXSksCiAgICAgICAgICAgICBidWdUcmFja2VyczogdGhpcy5fbm9ybWFsaXplSWRNYXAo cGF5bG9hZFsnYnVnVHJhY2tlcnMnXSksCisgICAgICAgICAgICBkYXNoYm9hcmRzOiBbe2lkOiAx LCBzZXJpYWxpemVkOiBKU09OLnN0cmluZ2lmeShwYXlsb2FkWydkZWZhdWx0RGFzaGJvYXJkJ10p fV0sCiAgICAgICAgIH07CiAKICAgICAgICAgZm9yICh2YXIgdGVzdElkIGluIHBheWxvYWRbJ3Rl c3RzJ10pIHsKQEAgLTE3MSw3ICsyMjEsNyBAQCBBcHAuTWFuaWZlc3QgPSBFbWJlci5Db250cm9s bGVyLmV4dGVuZCh7CiAgICAgbWV0cmljOiBmdW5jdGlvbiAoaWQpIHsgcmV0dXJuIHRoaXMuX21l dHJpY0J5SWRbaWRdOyB9LAogICAgIGJ1aWxkZXI6IGZ1bmN0aW9uIChpZCkgeyByZXR1cm4gdGhp cy5fYnVpbGRlckJ5SWRbaWRdOyB9LAogICAgIHJlcG9zaXRvcnk6IGZ1bmN0aW9uIChpZCkgeyBy ZXR1cm4gdGhpcy5fcmVwb3NpdG9yeUJ5SWRbaWRdOyB9LAotICAgIF9mZXRjaGVkTWFuaWZlc3Q6 IGZ1bmN0aW9uIChzdG9yZSkKKyAgICBfZmV0Y2hlZE1hbmlmZXN0OiBmdW5jdGlvbiAoc3RvcmUs IGRhdGEpCiAgICAgewogICAgICAgICB2YXIgc3RhcnRUaW1lID0gRGF0ZS5ub3coKTsKICAgICAg ICAgdmFyIHNlbGYgPSB0aGlzOwpAQCAtMjA2LDYgKzI1Niw4IEBAIEFwcC5NYW5pZmVzdCA9IEVt YmVyLkNvbnRyb2xsZXIuZXh0ZW5kKHsKICAgICAgICAgICAgIHJlcG9zaXRvcmllcy5maWx0ZXIo ZnVuY3Rpb24gKHJlcG9zaXRvcnkpIHsgcmV0dXJuIHJlcG9zaXRvcnkuZ2V0KCdoYXNSZXBvcnRl ZENvbW1pdHMnKTsgfSkpOwogCiAgICAgICAgIHRoaXMuc2V0KCdidWdUcmFja2VycycsIHN0b3Jl LmFsbCgnYnVnVHJhY2tlcicpLnNvcnRCeSgnbmFtZScpKTsKKworICAgICAgICB0aGlzLnNldCgn ZGVmYXVsdERhc2hib2FyZCcsIHN0b3JlLmFsbCgnZGFzaGJvYXJkJykub2JqZWN0QXQoMCkpOwog ICAgIH0sCiAgICAgZmV0Y2hSdW5zV2l0aFBsYXRmb3JtQW5kTWV0cmljOiBmdW5jdGlvbiAoc3Rv cmUsIHBsYXRmb3JtSWQsIG1ldHJpY0lkKQogICAgIHsK 242101 2014-11-21 19:35:57 -0800 2014-11-21 19:42:10 -0800 Reverted an irrelevant change bug-138994-20141121193612.patch text/plain 9484 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NDM1CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCAzYzk4OGU4ZjAwZTZmY2I2N2ZjMmVkZDZjYmMzYmUxOGJjNzA4MTJiLi5hYzM3ZmYzNWJh YTE2NDhmNjNlNmI4MTE1ZGQyNTlhMGRjNTJjMGZiIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxNC0xMS0yMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KKworICAgICAgICBUaGUgZGFzaGJvYXJkIG9uIG5ldyBwZXJmIG1vbml0b3Ig c2hvdWxkIGJlIGNvbmZpZ3VyYWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM4OTk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRm9yIG5vdywgbWFrZSBpdCBjb25maWd1cmFibGUgdmlhIGNvbmZpZy5q c29uLiBXZSBzaG91bGQgZXZlbnR1YWxseSBtYWtlIGl0IGNvbmZpZ3VyYWJsZSB2aWEKKyAgICAg ICAgYW4gYWRtaW5pc3RyYXRpdmUgcGFnZSBidXQgdGhpcyB3aWxsIGRvIGZvciBub3cuCisKKyAg ICAgICAgKiBjb25maWcuanNvbjogQWRkZWQgdGhlIGVtcHR5IGRhc2hib2FyZCBjb25maWd1cmF0 aW9uLgorCisgICAgICAgICogcHVibGljL2luY2x1ZGUvbWFuaWZlc3QucGhwOiBJbmNsdWRlIHRo ZSBkYXNoYm9hcmQgY29uZmlndXJhdGlvbiBpbiB0aGUgbWFuaWZlc3QgZmlsZS4KKworICAgICAg ICAqIHB1YmxpYy92Mi9hcHAuanM6CisgICAgICAgIChBcHAuSW5kZXhDb250cm9sbGVyKTogUmVt b3ZlZCBkZWZhdWx0VGFibGUgc2luY2UgdGhpcyBpcyBub3cgZHluYW1pY2FsbHkgb2J0YWluZWQg dmlhIEFwcC5NYW5pZmVzdC4KKyAgICAgICAgKEFwcC5JbmRleENvbnRyb2xsZXIuZ3JpZENoYW5n ZWQpOiBVc2UgQXBwLkRhc2hib2FyZCB0byBwYXJzZSB0aGUgZGFzaGJvYXJkIGNvbmZpZ3VyYXRp b24uCisgICAgICAgIEFsc28gb2J0YWluIHRoZSBkZWZhdWx0IGNvbmZpZ3VyYXRpb24gZnJvbSBB cHAuTWFuaWZlc3QuCisgICAgICAgIChBcHAuSW5kZXhDb250cm9sbGVyLl9ub3JtYWxpemVUYWJs ZSk6IE1vdmVkIHRvIEFwcC5EYXNoYm9hcmQuCisKKyAgICAgICAgKiBwdWJsaWMvdjIvbWFuaWZl c3QuanM6CisgICAgICAgIChBcHAuUmVwb3NpdG9yeS51cmxGb3JSZXZpc2lvbik6IEZpeGVkIHRo ZSBwb3NpdGlvbiBvZiB0aGUgb3BlbiBjdXJseSBicmFja2V0LgorICAgICAgICAoQXBwLlJlcG9z aXRvcnkudXJsRm9yUmV2aXNpb25SYW5nZSk6IERpdHRvLgorICAgICAgICAoQXBwLkRhc2hib2Fy ZCk6IEFkZGVkLgorICAgICAgICAoQXBwLkRhc2hib2FyZC50YWJsZSk6IEV4dHJhY3RlZCBmcm9t IEFwcC5JbmRleENvbnRyb2xsZXIuZ3JpZENoYW5nZWQuCisgICAgICAgIChBcHAuRGFzaGJvYXJk LnJvd3MpOiBEaXR0by4KKyAgICAgICAgKEFwcC5EYXNoYm9hcmQuaGVhZGVyQ29sdW1ucyk6IERp dHRvLgorICAgICAgICAoQXBwLkRhc2hib2FyZC5fbm9ybWFsaXplVGFibGUpOiBNb3ZlZCBmcm9t IEFwcC5JbmRleENvbnRyb2xsZXIuX25vcm1hbGl6ZVRhYmxlLgorICAgICAgICAoQXBwLk1ldHJp Y1NlcmlhbGl6ZXIubm9ybWFsaXplUGF5bG9hZCk6IFN5bnRoZXNpemUgYSBkYXNoYm9hcmQgcmVj b3JkIGZyb20gdGhlIGNvbmZpZ3VyYXRpb24uCisgICAgICAgIFNpbmNlIHRoZXJlIGlzIGV4YWN0 bHkgb25lIGRhc2hib2FyZCBvYmplY3QgcGVyIGFwcCwgaXQncyBva2F5IHRvIGhhcmQgY29kZSBh biBpZCBoZXJlLgorICAgICAgICAoQXBwLk1hbmlmZXN0Ll9mZXRjaGVkTWFuaWZlc3QpOiBTZXQg ZGVmYXVsdERhc2hib2FyZCB0byB0aGUgb25lIGFuZCBvbmx5IG9uZSBkYXNoYm9hcmQgd2UgaGF2 ZS4KKwogMjAxNC0xMS0yMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAg ICAgICBGaXggbWlzYyBidWdzIGFuZCB0eXBvcyBpbiBhcHAuanMKZGlmZiAtLWdpdCBhL1dlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy9jb25maWcuanNvbiBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy9jb25maWcuanNvbgppbmRleCA0ODY2NjRmYjNhOTBkYjljZDFiNDQ2MjY2ZmU1YTkyNTU3ZTE1 NTJjLi4zYmIzZTBjNjQyZmY4YzZlNjQxZTRlZWY0MzRjZTA5YWEzNzk3YWU0IDEwMDY0NAotLS0g YS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvY29uZmlnLmpzb24KKysrIGIvV2Vic2l0ZXMvcGVy Zi53ZWJraXQub3JnL2NvbmZpZy5qc29uCkBAIC0xMiw1ICsxMiw2IEBACiAgICAgInRlc3RTZXJ2 ZXIiOiB7CiAgICAgICAgICJob3N0bmFtZSI6ICJsb2NhbGhvc3QiLAogICAgICAgICAicG9ydCI6 IDgwCi0gICAgfQorICAgIH0sCisgICAgImRlZmF1bHREYXNoYm9hcmQiOiBbW11dCiB9CmRpZmYg LS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUvbWFuaWZlc3Qu cGhwIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9pbmNsdWRlL21hbmlmZXN0LnBo cAppbmRleCA0Njc4ZTk1ZGJhOGEwNzQ4NmE5OGFiN2I4M2RlNDM3MDI4OWMxNTAwLi41MTZjZjk3 NDM1ZTQ3ZDQxNzA2YjIyYTY0NTQ2NDQ3OGIzY2QxMTY3IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUvbWFuaWZlc3QucGhwCisrKyBiL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvaW5jbHVkZS9tYW5pZmVzdC5waHAKQEAgLTMyLDYgKzMy LDcgQEAgY2xhc3MgTWFuaWZlc3RHZW5lcmF0b3IgewogICAgICAgICAgICAgJ3JlcG9zaXRvcmll cycgPT4gJHRoaXMtPnJlcG9zaXRvcmllcygkcmVwb3NpdG9yaWVzX3RhYmxlLCAkcmVwb3NpdG9y aWVzX3dpdGhfY29tbWl0KSwKICAgICAgICAgICAgICdidWlsZGVycycgPT4gJHRoaXMtPmJ1aWxk ZXJzKCksCiAgICAgICAgICAgICAnYnVnVHJhY2tlcnMnID0+ICR0aGlzLT5idWdfdHJhY2tlcnMo JHJlcG9zaXRvcmllc190YWJsZSksCisgICAgICAgICAgICAnZGVmYXVsdERhc2hib2FyZCcgPT4g Y29uZmlnKCdkZWZhdWx0RGFzaGJvYXJkJyksCiAgICAgICAgICk7CiAgICAgICAgIHJldHVybiAk dGhpcy0+bWFuaWZlc3Q7CiAgICAgfQpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3B1YmxpYy92Mi9hcHAuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3Yy L2FwcC5qcwppbmRleCBiZWM1MGExNTYwMDE2NjY2YmU1YzgzNDk1YTQ3YjFlYWFlODIyMDhlLi5k OGE4MmIzNmRiMjMwNDI0NGYyYjRmYTc1YmFmMjNjNjQwMzIwN2U1IDEwMDc1NQotLS0gYS9XZWJz aXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL2FwcC5qcworKysgYi9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvcHVibGljL3YyL2FwcC5qcwpAQCAtNTcsNyArNTcsNiBAQCBBcHAuRGFzaGJv YXJkUGFuZVByb3h5Rm9yUGlja2VyID0gRW1iZXIuT2JqZWN0UHJveHkuZXh0ZW5kKHsKIEFwcC5J bmRleENvbnRyb2xsZXIgPSBFbWJlci5Db250cm9sbGVyLmV4dGVuZCh7CiAgICAgcXVlcnlQYXJh bXM6IFsnZ3JpZCcsICdudW1iZXJPZkRheXMnXSwKICAgICBfcHJldmlvdXNHcmlkOiB7fSwKLSAg ICBkZWZhdWx0VGFibGU6IFtdLAogICAgIGhlYWRlckNvbHVtbnM6IFtdLAogICAgIHJvd3M6IFtd LAogICAgIG51bWJlck9mRGF5czogMzAsCkBAIC02OSwyNyArNjgsMjQgQEAgQXBwLkluZGV4Q29u dHJvbGxlciA9IEVtYmVyLkNvbnRyb2xsZXIuZXh0ZW5kKHsKICAgICAgICAgaWYgKGdyaWQgPT09 IHRoaXMuX3ByZXZpb3VzR3JpZCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB2YXIg dGFibGUgPSBudWxsOwotICAgICAgICB0cnkgewotICAgICAgICAgICAgaWYgKGdyaWQpCi0gICAg ICAgICAgICAgICAgdGFibGUgPSBKU09OLnBhcnNlKGdyaWQpOwotICAgICAgICB9IGNhdGNoIChl cnJvcikgewotICAgICAgICAgICAgY29uc29sZS5sb2coIkZhaWxlZCB0byBwYXJzZSB0aGUgZ3Jp ZDoiLCBlcnJvciwgZ3JpZCk7CisgICAgICAgIHZhciBkYXNoYm9hcmQgPSBudWxsOworICAgICAg ICBpZiAoZ3JpZCkgeworICAgICAgICAgICAgZGFzaGJvYXJkID0gQXBwLkRhc2hib2FyZC5jcmVh dGUoe3NlcmlhbGl6ZWQ6IGdyaWR9KTsKKyAgICAgICAgICAgIGlmICghZGFzaGJvYXJkLmdldCgn aGVhZGVyQ29sdW1ucycpLmxlbmd0aCkKKyAgICAgICAgICAgICAgICBkYXNoYm9hcmQgPSBudWxs OwogICAgICAgICB9CisgICAgICAgIGlmICghZGFzaGJvYXJkKQorICAgICAgICAgICAgZGFzaGJv YXJkID0gQXBwLk1hbmlmZXN0LmdldCgnZGVmYXVsdERhc2hib2FyZCcpOworICAgICAgICBpZiAo IWRhc2hib2FyZCkKKyAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAoIXRhYmxlIHx8 ICF0YWJsZS5sZW5ndGgpIC8vIEZJWE1FOiBXZSBzaG91bGQgZmV0Y2ggdGhpcyBmcm9tIHRoZSBt YW5pZmVzdC4KLSAgICAgICAgICAgIHRhYmxlID0gdGhpcy5nZXQoJ2RlZmF1bHRUYWJsZScpOwot Ci0gICAgICAgIHRhYmxlID0gdGhpcy5fbm9ybWFsaXplVGFibGUodGFibGUpOwotICAgICAgICB2 YXIgY29sdW1uQ291bnQgPSB0YWJsZVswXS5sZW5ndGg7CisgICAgICAgIHZhciBoZWFkZXJDb2x1 bW5zID0gZGFzaGJvYXJkLmdldCgnaGVhZGVyQ29sdW1ucycpOworICAgICAgICB0aGlzLnNldCgn aGVhZGVyQ29sdW1ucycsIGhlYWRlckNvbHVtbnMpOworICAgICAgICB2YXIgY29sdW1uQ291bnQg PSBoZWFkZXJDb2x1bW5zLmxlbmd0aDsKICAgICAgICAgdGhpcy5zZXQoJ2NvbHVtbkNvdW50Jywg Y29sdW1uQ291bnQpOwogCi0gICAgICAgIHRoaXMuc2V0KCdoZWFkZXJDb2x1bW5zJywgdGFibGVb MF0ubWFwKGZ1bmN0aW9uIChuYW1lLCBpbmRleCkgewotICAgICAgICAgICAgcmV0dXJuIHtsYWJl bDpuYW1lLCBpbmRleDogaW5kZXh9OwotICAgICAgICB9KSk7Ci0KICAgICAgICAgdmFyIHN0b3Jl ID0gdGhpcy5zdG9yZTsKLSAgICAgICAgdGhpcy5zZXQoJ3Jvd3MnLCB0YWJsZS5zbGljZSgxKS5t YXAoZnVuY3Rpb24gKHJvd1BhcmFtKSB7CisgICAgICAgIHRoaXMuc2V0KCdyb3dzJywgZGFzaGJv YXJkLmdldCgncm93cycpLm1hcChmdW5jdGlvbiAocm93UGFyYW0pIHsKICAgICAgICAgICAgIHJl dHVybiBBcHAuRGFzaGJvYXJkUm93LmNyZWF0ZSh7CiAgICAgICAgICAgICAgICAgc3RvcmU6IHN0 b3JlLAogICAgICAgICAgICAgICAgIGhlYWRlcjogcm93UGFyYW1bMF0sCkBAIC05OSwyMiArOTUs NyBAQCBBcHAuSW5kZXhDb250cm9sbGVyID0gRW1iZXIuQ29udHJvbGxlci5leHRlbmQoewogICAg ICAgICB9KSk7CiAKICAgICAgICAgdGhpcy5zZXQoJ2VtcHR5Um93JywgbmV3IEFycmF5KGNvbHVt bkNvdW50KSk7Ci0gICAgfS5vYnNlcnZlcygnZ3JpZCcpLm9uKCdpbml0JyksCi0KLSAgICBfbm9y bWFsaXplVGFibGU6IGZ1bmN0aW9uICh0YWJsZSkKLSAgICB7Ci0gICAgICAgIHZhciBtYXhDb2x1 bW5Db3VudCA9IE1hdGgubWF4KHRhYmxlLm1hcChmdW5jdGlvbiAoY29sdW1uKSB7IHJldHVybiBj b2x1bW4ubGVuZ3RoOyB9KSk7Ci0gICAgICAgIGZvciAodmFyIGkgPSAxOyBpIDwgdGFibGUubGVu Z3RoOyBpKyspIHsKLSAgICAgICAgICAgIHZhciByb3cgPSB0YWJsZVtpXTsKLSAgICAgICAgICAg IGZvciAodmFyIGogPSAxOyBqIDwgcm93Lmxlbmd0aDsgaisrKSB7Ci0gICAgICAgICAgICAgICAg aWYgKHJvd1tqXSAmJiAhKHJvd1tqXSBpbnN0YW5jZW9mIEFycmF5KSkgewotICAgICAgICAgICAg ICAgICAgICBjb25zb2xlLmxvZygnVW5yZWNvZ25pemVkIChwbGF0Zm9ybSwgbWV0cmljKSBwYWly IGF0IGNvbHVtbiAnICsgaSArICcgcm93ICcgKyBqICsgJzonICsgcm93W2pdKTsKLSAgICAgICAg ICAgICAgICAgICAgcm93W2pdID0gW107Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAg fQotICAgICAgICB9Ci0gICAgICAgIHJldHVybiB0YWJsZTsKLSAgICB9LAorICAgIH0ub2JzZXJ2 ZXMoJ2dyaWQnLCAnQXBwLk1hbmlmZXN0LmRlZmF1bHREYXNoYm9hcmQnKS5vbignaW5pdCcpLAog CiAgICAgdXBkYXRlR3JpZDogZnVuY3Rpb24oKQogICAgIHsKZGlmZiAtLWdpdCBhL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvbWFuaWZlc3QuanMgYi9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvcHVibGljL3YyL21hbmlmZXN0LmpzCmluZGV4IDdjY2EwMDlmZWY5MGE4NTJlNzgx Mzg4MWE1NGViNmFiM2NjOTRhYWYuLjIzMTQ5OGUzMjc2ZDUxYWVhMjE1Yzk5Y2RhMDg3MjhmY2Yx ZGQ3YjUgMTAwNzU1Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvbWFu aWZlc3QuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9tYW5pZmVz dC5qcwpAQCAtODAsMTQgKzgwLDYzIEBAIEFwcC5SZXBvc2l0b3J5ID0gQXBwLk5hbWVMYWJlbE1v ZGVsLmV4dGVuZCh7CiAgICAgdXJsOiBEUy5hdHRyKCdzdHJpbmcnKSwKICAgICBibGFtZVVybDog RFMuYXR0cignc3RyaW5nJyksCiAgICAgaGFzUmVwb3J0ZWRDb21taXRzOiBEUy5hdHRyKCdib29s ZWFuJyksCi0gICAgdXJsRm9yUmV2aXNpb246IGZ1bmN0aW9uIChjdXJyZW50UmV2aXNpb24pIHsK KyAgICB1cmxGb3JSZXZpc2lvbjogZnVuY3Rpb24gKGN1cnJlbnRSZXZpc2lvbikKKyAgICB7CiAg ICAgICAgIHJldHVybiAodGhpcy5nZXQoJ3VybCcpIHx8ICcnKS5yZXBsYWNlKC9cJDEvZywgY3Vy cmVudFJldmlzaW9uKTsKICAgICB9LAotICAgIHVybEZvclJldmlzaW9uUmFuZ2U6IGZ1bmN0aW9u IChmcm9tLCB0bykgeworICAgIHVybEZvclJldmlzaW9uUmFuZ2U6IGZ1bmN0aW9uIChmcm9tLCB0 bykKKyAgICB7CiAgICAgICAgIHJldHVybiAodGhpcy5nZXQoJ2JsYW1lVXJsJykgfHwgJycpLnJl cGxhY2UoL1wkMS9nLCBmcm9tKS5yZXBsYWNlKC9cJDIvZywgdG8pOwogICAgIH0sCiB9KTsKIAor QXBwLkRhc2hib2FyZCA9IEFwcC5Nb2RlbC5leHRlbmQoeworICAgIHNlcmlhbGl6ZWQ6IERTLmF0 dHIoJ3N0cmluZycpLAorICAgIHRhYmxlOiBmdW5jdGlvbiAoKQorICAgIHsKKyAgICAgICAgdmFy IGpzb24gPSB0aGlzLmdldCgnc2VyaWFsaXplZCcpOworICAgICAgICB0cnkgeworICAgICAgICAg ICAgdmFyIHBhcnNlZCA9IEpTT04ucGFyc2UoanNvbik7CisgICAgICAgIH0gY2F0Y2ggKGVycm9y KSB7CisgICAgICAgICAgICBjb25zb2xlLmxvZygiRmFpbGVkIHRvIHBhcnNlIHRoZSBncmlkOiIs IGVycm9yLCBqc29uKTsKKyAgICAgICAgICAgIHJldHVybiBbXTsKKyAgICAgICAgfQorICAgICAg ICBpZiAoIXBhcnNlZCkKKyAgICAgICAgICAgIHJldHVybiBbXTsKKyAgICAgICAgcmV0dXJuIHRo aXMuX25vcm1hbGl6ZVRhYmxlKHBhcnNlZCk7CisgICAgfS5wcm9wZXJ0eSgnc2VyaWFsaXplZCcp LAorCisgICAgcm93czogZnVuY3Rpb24gKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLmdl dCgndGFibGUnKS5zbGljZSgxKTsKKyAgICB9LnByb3BlcnR5KCd0YWJsZScpLAorCisgICAgaGVh ZGVyQ29sdW1uczogZnVuY3Rpb24gKCkKKyAgICB7CisgICAgICAgIHZhciB0YWJsZSA9IHRoaXMu Z2V0KCd0YWJsZScpOworICAgICAgICBpZiAoIXRhYmxlIHx8ICF0YWJsZS5sZW5ndGgpCisgICAg ICAgICAgICByZXR1cm4gW107CisgICAgICAgIHJldHVybiB0YWJsZVswXS5tYXAoZnVuY3Rpb24g KG5hbWUsIGluZGV4KSB7CisgICAgICAgICAgICByZXR1cm4ge2xhYmVsOm5hbWUsIGluZGV4OiBp bmRleH07CisgICAgICAgIH0pOworICAgIH0ucHJvcGVydHkoJ3RhYmxlJyksCisKKyAgICBfbm9y bWFsaXplVGFibGU6IGZ1bmN0aW9uICh0YWJsZSkKKyAgICB7CisgICAgICAgIHZhciBtYXhDb2x1 bW5Db3VudCA9IE1hdGgubWF4KHRhYmxlLm1hcChmdW5jdGlvbiAoY29sdW1uKSB7IHJldHVybiBj b2x1bW4ubGVuZ3RoOyB9KSk7CisgICAgICAgIGZvciAodmFyIGkgPSAxOyBpIDwgdGFibGUubGVu Z3RoOyBpKyspIHsKKyAgICAgICAgICAgIHZhciByb3cgPSB0YWJsZVtpXTsKKyAgICAgICAgICAg IGZvciAodmFyIGogPSAxOyBqIDwgcm93Lmxlbmd0aDsgaisrKSB7CisgICAgICAgICAgICAgICAg aWYgKHJvd1tqXSAmJiAhKHJvd1tqXSBpbnN0YW5jZW9mIEFycmF5KSkgeworICAgICAgICAgICAg ICAgICAgICBjb25zb2xlLmxvZygnVW5yZWNvZ25pemVkIChwbGF0Zm9ybSwgbWV0cmljKSBwYWly IGF0IGNvbHVtbiAnICsgaSArICcgcm93ICcgKyBqICsgJzonICsgcm93W2pdKTsKKyAgICAgICAg ICAgICAgICAgICAgcm93W2pdID0gW107CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg fQorICAgICAgICB9CisgICAgICAgIHJldHVybiB0YWJsZTsKKyAgICB9LAorfSk7CisKIEFwcC5N ZXRyaWNTZXJpYWxpemVyID0gQXBwLlBsYXRmb3JtU2VyaWFsaXplciA9IERTLlJFU1RTZXJpYWxp emVyLmV4dGVuZCh7CiAgICAgbm9ybWFsaXplUGF5bG9hZDogZnVuY3Rpb24gKHBheWxvYWQpCiAg ICAgewpAQCAtMTAxLDYgKzE1MCw3IEBAIEFwcC5NZXRyaWNTZXJpYWxpemVyID0gQXBwLlBsYXRm b3JtU2VyaWFsaXplciA9IERTLlJFU1RTZXJpYWxpemVyLmV4dGVuZCh7CiAgICAgICAgICAgICBt ZXRyaWNzOiB0aGlzLl9ub3JtYWxpemVJZE1hcChwYXlsb2FkWydtZXRyaWNzJ10pLAogICAgICAg ICAgICAgcmVwb3NpdG9yaWVzOiB0aGlzLl9ub3JtYWxpemVJZE1hcChwYXlsb2FkWydyZXBvc2l0 b3JpZXMnXSksCiAgICAgICAgICAgICBidWdUcmFja2VyczogdGhpcy5fbm9ybWFsaXplSWRNYXAo cGF5bG9hZFsnYnVnVHJhY2tlcnMnXSksCisgICAgICAgICAgICBkYXNoYm9hcmRzOiBbe2lkOiAx LCBzZXJpYWxpemVkOiBKU09OLnN0cmluZ2lmeShwYXlsb2FkWydkZWZhdWx0RGFzaGJvYXJkJ10p fV0sCiAgICAgICAgIH07CiAKICAgICAgICAgZm9yICh2YXIgdGVzdElkIGluIHBheWxvYWRbJ3Rl c3RzJ10pIHsKQEAgLTIwNiw2ICsyNTYsOCBAQCBBcHAuTWFuaWZlc3QgPSBFbWJlci5Db250cm9s bGVyLmV4dGVuZCh7CiAgICAgICAgICAgICByZXBvc2l0b3JpZXMuZmlsdGVyKGZ1bmN0aW9uIChy ZXBvc2l0b3J5KSB7IHJldHVybiByZXBvc2l0b3J5LmdldCgnaGFzUmVwb3J0ZWRDb21taXRzJyk7 IH0pKTsKIAogICAgICAgICB0aGlzLnNldCgnYnVnVHJhY2tlcnMnLCBzdG9yZS5hbGwoJ2J1Z1Ry YWNrZXInKS5zb3J0QnkoJ25hbWUnKSk7CisKKyAgICAgICAgdGhpcy5zZXQoJ2RlZmF1bHREYXNo Ym9hcmQnLCBzdG9yZS5hbGwoJ2Rhc2hib2FyZCcpLm9iamVjdEF0KDApKTsKICAgICB9LAogICAg IGZldGNoUnVuc1dpdGhQbGF0Zm9ybUFuZE1ldHJpYzogZnVuY3Rpb24gKHN0b3JlLCBwbGF0Zm9y bUlkLCBtZXRyaWNJZCkKICAgICB7Cg==