153330 2016-01-21 16:22:42 -0800 Fix bugs caused by incorrect usage of "branch" vs. "branchName". 2016-01-27 14:05:43 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=152345 P2 Normal --- 152345 1 jmarcell webkit-unassigned adele ap dbates dean_johnson dino jmarcell lforschler oldest_to_newest 1157488 0 jmarcell 2016-01-21 16:22:42 -0800 Fix bugs caused by incorrect usage of "branch" vs. "branchName". 1157495 1 269517 jmarcell 2016-01-21 16:31:52 -0800 Created attachment 269517 Patch 1157742 2 269586 jmarcell 2016-01-22 11:09:21 -0800 Created attachment 269586 Patch 1159327 3 269586 dean_johnson 2016-01-27 10:43:19 -0800 Comment on attachment 269586 Patch r=me! 1159404 4 269586 dbates 2016-01-27 13:50:25 -0800 Comment on attachment 269586 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=269586&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:113 > + _popoverLinesForCommitRange: function(trac, branch, firstRevisionNumber, lastRevisionNumber) I'm assuming you plan to make more use of the branch object in a subsequent patch than to get the branch name. Currently this function only makes use of the branch name. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js:115 > + var branch = this.trunkBranch; This variable is used exactly once and I do not feel that its name makes the purpose of this variable any more understandable than its values. I suggest that we inline the value of this variable into the line below (line 116) and remove this variable. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js:129 > + var branch = this.trunkBranch; By a similar argument as above, I suggest inlining the value of this variable where its referenced and remove this variable. 1159406 5 269586 jmarcell 2016-01-27 13:57:02 -0800 Comment on attachment 269586 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=269586&action=review >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:113 >> + _popoverLinesForCommitRange: function(trac, branch, firstRevisionNumber, lastRevisionNumber) > > I'm assuming you plan to make more use of the branch object in a subsequent patch than to get the branch name. Currently this function only makes use of the branch name. That's correct. I do have a forthcoming patch that will make use of properties other than the branch name. >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js:115 >> + var branch = this.trunkBranch; > > This variable is used exactly once and I do not feel that its name makes the purpose of this variable any more understandable than its values. I suggest that we inline the value of this variable into the line below (line 116) and remove this variable. Will do. >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js:129 >> + var branch = this.trunkBranch; > > By a similar argument as above, I suggest inlining the value of this variable where its referenced and remove this variable. Will do. 1159413 6 jmarcell 2016-01-27 14:05:43 -0800 Landed: http://trac.webkit.org/changeset/195690 269517 2016-01-21 16:31:52 -0800 2016-01-22 11:09:18 -0800 Patch bug-153330-20160121163124.patch text/plain 10828 jmarcell U3VidmVyc2lvbiBSZXZpc2lvbjogMTk1NDI4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGVjMTA5YzI0NzBhMzVmMjA5Nzc3ZDIzZmZkZjk0MGE2 MjgyNWY2YS4uYWJkOTI0NGI0ZGFlZjZkMWQ2OGQ2ZGJkNTYzNDg1MjM2YzExMThmZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE2LTAxLTIxICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgorCisg ICAgICAgIEZpeCBidWdzIGNhdXNlZCBieSBpbmNvcnJlY3QgdXNhZ2Ugb2YgImJyYW5jaCIgdnMu ICJicmFuY2hOYW1lIi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1MzMzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEluIGFuIGVhcmxpZXIgcGF0Y2ggd2Ugc3RhcnRlZCB1c2luZyB0aGUgbmFtZSAiYnJh bmNoIiB0byBpbmRpY2F0ZSBhIGJyYW5jaCBvYmplY3QsIHdoZXJlYXMKKyAgICAgICAgImJyYW5j aE5hbWUiIGltcGxpZXMgdGhhdCB0aGUgdmFyaWFibGUgb3IgcHJvcGVydHkgaW4gcXVlc3Rpb24g aXMgc2ltcGx5IGEgc3RyaW5nLiBXZSBmaXhlZCBzb21lCisgICAgICAgIGluY29uc2lzdGVuY2ll cyByZWdhcmRpbmcgdGhpcyBpc3N1ZSBpbiAxNTI5ODIgYnV0IGZ1cnRoZXIgYnVncyBhbmQgaW5j b25zaXN0ZW5jaWVzIHdlcmUgcmVjZW50bHkKKyAgICAgICAgc3BvdHRlZCBpbiBCdWlsZGJvdFF1 ZXVlVmlldy5qcy4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3 LmpzOgorICAgICAgICAoQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlLl9wb3BvdmVyTGluZXNG b3JDb21taXRSYW5nZSk6IENoYW5nZSBicmFuY2hOYW1lIHRvIGJyYW5jaCBpbiBtZXRob2Qgc2ln bmF0dXJlLgorICAgICAgICBDaGFuZ2VkIGJyYW5jaE5hbWUgdG8gYnJhbmNoLm5hbWUgaW4gY2Fs bCB0byBjb21taXRzT25CcmFuY2guCisgICAgICAgIChCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5 cGUuX3ByZXNlbnRQb3BvdmVyRm9yUGVuZGluZ0NvbW1pdHMpOiBDaGFuZ2UgYnJhbmNoLm5hbWUg dG8gYnJhbmNoIGluIGNhbGwgdG8KKyAgICAgICAgX3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJhbmdl LgorICAgICAgICAoQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlLl9wcmVzZW50UG9wb3ZlckZv clJldmlzaW9uUmFuZ2UpOiBDaGFuZ2VkIGNvbnRleHQuYnJhbmNoTmFtZSB0byBjb250ZXh0LmJy YW5jaC5uYW1lLgorICAgICAgICAoQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlLl9yZXZpc2lv bkNvbnRlbnRXaXRoUG9wb3ZlckZvckl0ZXJhdGlvbik6IENoYW5nZWQgYnJhbmNoLm5hbWUgdG8g YnJhbmNoLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL3Rlc3RzLmpzOiBBZGRlZCB0 ZXN0cyB0byB2ZXJpZnkKKyAgICAgICAgZml4LgorCiAyMDE2LTAxLTIwICBKYXNvbiBNYXJjZWxs ICA8am1hcmNlbGxAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZmFjdG9yIGxvZ2ljIGZvciBwYXJz aW5nIFRyYWMgcmV2aXNpb25zIGludG8gaXRzIG93biBmdW5jdGlvbiBhbmQgYWRkIGxvZ2ljIGZv ciBwYXJzaW5nIGdpdCBoYXNoZXMuCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9C dWlsZGJvdFF1ZXVlVmlldy5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVW aWV3LmpzCmluZGV4IDIzYjlkMDcwZTlhNTk4NWQwMGQ0ZjgzZDYyMzVjYWRjNTM5MGVlZmIuLjhi NWYwYjlhYjA2OTVlODk0ZjFiZDEwZTA2YmU2MjllZmM0NTljOTkgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rh c2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzCisrKyBiL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9T Y3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzCkBAIC0xMTAsNyArMTEwLDcgQEAgQnVpbGRib3RR dWV1ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBuZXcgUG9wb3ZlclRyYWNrZXIobWVzc2Fn ZUVsZW1lbnQsIHRoaXMuX3ByZXNlbnRQb3BvdmVyRm9yUGVuZGluZ0NvbW1pdHMuYmluZCh0aGlz KSwgcXVldWUpOwogICAgIH0sCiAKLSAgICBfcG9wb3ZlckxpbmVzRm9yQ29tbWl0UmFuZ2U6IGZ1 bmN0aW9uKHRyYWMsIGJyYW5jaE5hbWUsIGZpcnN0UmV2aXNpb25OdW1iZXIsIGxhc3RSZXZpc2lv bk51bWJlcikKKyAgICBfcG9wb3ZlckxpbmVzRm9yQ29tbWl0UmFuZ2U6IGZ1bmN0aW9uKHRyYWMs IGJyYW5jaCwgZmlyc3RSZXZpc2lvbk51bWJlciwgbGFzdFJldmlzaW9uTnVtYmVyKQogICAgIHsK ICAgICAgICAgZnVuY3Rpb24gbGluZUZvckNvbW1pdCh0cmFjLCBjb21taXQpCiAgICAgICAgIHsK QEAgLTE0MSw3ICsxNDEsNyBAQCBCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAKICAg ICAgICAgLy8gRklYTUU6IFRvIGJlIDEwMCUgY29ycmVjdCwgd2Ugc2hvdWxkIGFsc28gZmlsdGVy IG91dCBjaGFuZ2VzIHRoYXQgYXJlIGlnbm9yZWQgYnkKICAgICAgICAgLy8gdGhlIHF1ZXVlLCBz ZWUgX3Nob3VsZF9maWxlX3RyaWdnZXJfYnVpbGQgaW4gd2tidWlsZC5weS4KLSAgICAgICAgdmFy IGNvbW1pdHMgPSB0cmFjLmNvbW1pdHNPbkJyYW5jaChicmFuY2hOYW1lLCBmdW5jdGlvbihjb21t aXQpIHsgcmV0dXJuIGNvbW1pdC5yZXZpc2lvbk51bWJlciA+PSBmaXJzdFJldmlzaW9uTnVtYmVy ICYmIGNvbW1pdC5yZXZpc2lvbk51bWJlciA8PSBsYXN0UmV2aXNpb25OdW1iZXI7IH0pOworICAg ICAgICB2YXIgY29tbWl0cyA9IHRyYWMuY29tbWl0c09uQnJhbmNoKGJyYW5jaC5uYW1lLCBmdW5j dGlvbihjb21taXQpIHsgcmV0dXJuIGNvbW1pdC5yZXZpc2lvbk51bWJlciA+PSBmaXJzdFJldmlz aW9uTnVtYmVyICYmIGNvbW1pdC5yZXZpc2lvbk51bWJlciA8PSBsYXN0UmV2aXNpb25OdW1iZXI7 IH0pOwogICAgICAgICByZXR1cm4gY29tbWl0cy5tYXAoZnVuY3Rpb24oY29tbWl0KSB7CiAgICAg ICAgICAgICByZXR1cm4gbGluZUZvckNvbW1pdCh0cmFjLCBjb21taXQpOwogICAgICAgICB9LCB0 aGlzKS5yZXZlcnNlKCk7CkBAIC0xNjYsNyArMTY2LDcgQEAgQnVpbGRib3RRdWV1ZVZpZXcucHJv dG90eXBlID0gewogICAgICAgICAgICAgdmFyIGxhdGVzdFByb2R1Y3RpdmVSZXZpc2lvbk51bWJl ciA9IGxhdGVzdFByb2R1Y3RpdmVJdGVyYXRpb24ucmV2aXNpb25bcmVwb3NpdG9yeU5hbWVdOwog ICAgICAgICAgICAgaWYgKCFsYXRlc3RQcm9kdWN0aXZlUmV2aXNpb25OdW1iZXIgfHwgIXRyYWMu bGF0ZXN0UmVjb3JkZWRSZXZpc2lvbk51bWJlcikKICAgICAgICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgICAgIHZhciBsaW5lcyA9IHRoaXMuX3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJhbmdl KHRyYWMsIGJyYW5jaC5uYW1lLCBsYXRlc3RQcm9kdWN0aXZlUmV2aXNpb25OdW1iZXIgKyAxLCB0 cmFjLmxhdGVzdFJlY29yZGVkUmV2aXNpb25OdW1iZXIpOworICAgICAgICAgICAgdmFyIGxpbmVz ID0gdGhpcy5fcG9wb3ZlckxpbmVzRm9yQ29tbWl0UmFuZ2UodHJhYywgYnJhbmNoLCBsYXRlc3RQ cm9kdWN0aXZlUmV2aXNpb25OdW1iZXIgKyAxLCB0cmFjLmxhdGVzdFJlY29yZGVkUmV2aXNpb25O dW1iZXIpOwogICAgICAgICAgICAgdmFyIGxlbmd0aCA9IGxpbmVzLmxlbmd0aDsKICAgICAgICAg ICAgIGlmIChsZW5ndGggJiYgc2hvdWxkQWRkRGl2aWRlcikKICAgICAgICAgICAgICAgICB0aGlz Ll9hZGREaXZpZGVyVG9Qb3BvdmVyKGNvbnRlbnQpOwpAQCAtMTg4LDcgKzE4OCw3IEBAIEJ1aWxk Ym90UXVldWVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgY29udGVudC5jbGFzc05hbWUgPSAi Y29tbWl0LWhpc3RvcnktcG9wb3ZlciI7CiAKICAgICAgICAgLy8gRklYTUU6IE5vdGhpbmcgZ3Vh cmFudGVlcyB0aGF0IFRyYWMgaGFzIGhpc3RvcmljYWwgZGF0YSBmb3IgdGhlc2UgcmV2aXNpb25z LgotICAgICAgICB2YXIgbGluZXNGb3JDb21taXRzID0gdGhpcy5fcG9wb3ZlckxpbmVzRm9yQ29t bWl0UmFuZ2UoY29udGV4dC50cmFjLCBjb250ZXh0LmJyYW5jaE5hbWUsIGNvbnRleHQuZmlyc3RS ZXZpc2lvbiwgY29udGV4dC5sYXN0UmV2aXNpb24pOworICAgICAgICB2YXIgbGluZXNGb3JDb21t aXRzID0gdGhpcy5fcG9wb3ZlckxpbmVzRm9yQ29tbWl0UmFuZ2UoY29udGV4dC50cmFjLCBjb250 ZXh0LmJyYW5jaCwgY29udGV4dC5maXJzdFJldmlzaW9uLCBjb250ZXh0Lmxhc3RSZXZpc2lvbik7 CiAKICAgICAgICAgdmFyIGxpbmUgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAg ICAgICAgbGluZS5jbGFzc05hbWUgPSAidGl0bGUiOwpAQCAtMTk4LDcgKzE5OCw3IEBAIEJ1aWxk Ym90UXVldWVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGNvbnRlbnQuYXBwZW5kQ2hp bGQobGluZSk7CiAgICAgICAgICAgICB0aGlzLl9hZGREaXZpZGVyVG9Qb3BvdmVyKGNvbnRlbnQp OwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgbGluZS50ZXh0Q29udGVudCA9ICJubyBj b21taXRzIHRvICIgKyBjb250ZXh0LmJyYW5jaE5hbWUgKyAiIHNpbmNlIHByZXZpb3VzIHJlc3Vs dCI7CisgICAgICAgICAgICBsaW5lLnRleHRDb250ZW50ID0gIm5vIGNvbW1pdHMgdG8gIiArIGNv bnRleHQuYnJhbmNoLm5hbWUgKyAiIHNpbmNlIHByZXZpb3VzIHJlc3VsdCI7CiAgICAgICAgICAg ICBjb250ZW50LmFwcGVuZENoaWxkKGxpbmUpOwogICAgICAgICB9CiAKQEAgLTIzMiw3ICsyMzIs NyBAQCBCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjb25zb2xl LmFzc2VydChwcmV2aW91c0l0ZXJhdGlvbi5yZXZpc2lvbltyZXBvc2l0b3J5TmFtZV0pOwogICAg ICAgICAgICAgdmFyIGNvbnRleHQgPSB7CiAgICAgICAgICAgICAgICAgdHJhYzogcmVwb3NpdG9y eS50cmFjLAotICAgICAgICAgICAgICAgIGJyYW5jaE5hbWU6IGJyYW5jaC5uYW1lLAorICAgICAg ICAgICAgICAgIGJyYW5jaDogYnJhbmNoLAogICAgICAgICAgICAgICAgIGZpcnN0UmV2aXNpb246 IHByZXZpb3VzSXRlcmF0aW9uLnJldmlzaW9uW3JlcG9zaXRvcnlOYW1lXSArIDEsCiAgICAgICAg ICAgICAgICAgbGFzdFJldmlzaW9uOiBpdGVyYXRpb24ucmV2aXNpb25bcmVwb3NpdG9yeU5hbWVd CiAgICAgICAgICAgICB9OwpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMv dGVzdHMuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy90ZXN0cy5qcwppbmRleCA4MmJj ZjIwNDdhOTY5YjA1ZGU1N2IyNGU0OGI2NDhmMGJhYTdkMWUwLi5hNTAyNzhiODA1MWQxYThjYzM4 MTYwNmIyNmEwZDliZGFjNTM5MThlIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90 ZXN0cy90ZXN0cy5qcworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy90ZXN0cy5qcwpA QCAtMzUsMjYgKzM1LDEwMyBAQCB0ZXN0KCJfcGFyc2VSZXZpc2lvbkZyb21VUkwiLCBmdW5jdGlv bigpCiAgICAgZXF1YWwodC5fcGFyc2VSZXZpc2lvbkZyb21VUkwoImh0dHA6Ly90cmFjLmZvb2Jh ci5jb20vcmVwb3NpdG9yeS9jaGFuZ2VzZXQvNzUzODgvcHJvamVjdCIpLCAiNzUzODgiLCAiU3Vi dmVyc2lvbiB3aXRoIHN1ZmZpeCIpOwogICAgIGVxdWFsKHQuX3BhcnNlUmV2aXNpb25Gcm9tVVJM KCJodHRwczovL2dpdC5mb29iYXIuY29tL3RyYWMvV2hhdGV2ZXIuZ2l0L2NoYW5nZXNldC8wZTQ5 OGRiNWQ4ZTViNWEzNDI2MzEiKSwgIjBlNDk4ZGI1ZDhlNWI1YTM0MjYzMSIsICJHaXQiKTsKIH0p OwotbW9kdWxlKCJCdWlsZEJvdFF1ZXVlVmlldyIpOworCittb2R1bGUoIkJ1aWxkQm90UXVldWVW aWV3IiwgeworICAgIHNldHVwOiBmdW5jdGlvbigpIHsKKyAgICAgICAgdGhpcy50cmFjID0gbmV3 IE1vY2tUcmFjKCk7CisgICAgICAgIHRoaXMucXVldWUgPSBuZXcgTW9ja0J1aWxkYm90UXVldWUo KTsKKyAgICAgICAgdGhpcy50cnVua0JyYW5jaCA9IHsKKyAgICAgICAgICAgIG5hbWU6ICJ0cnVu ayIsCisgICAgICAgICAgICByZXBvc2l0b3J5OiB7CisgICAgICAgICAgICAgICAgbmFtZTogIm9w ZW5Tb3VyY2UiLAorICAgICAgICAgICAgICAgIHRyYWM6IHRoaXMudHJhYywKKyAgICAgICAgICAg ICAgICBpc1NWTjogdHJ1ZSwKKyAgICAgICAgICAgIH0KKyAgICAgICAgfTsKKyAgICAgICAgdGhp cy5xdWV1ZS5icmFuY2hlcyA9IFt0aGlzLnRydW5rQnJhbmNoXTsKKyAgICAgICAgdGhpcy52aWV3 ID0gbmV3IE1vY2tCdWlsZGJvdFF1ZXVlVmlldyhbdGhpcy5xdWV1ZV0pOworICAgIH0KK30pOwog CiB2YXIgc2V0dGluZ3MgPSBuZXcgU2V0dGluZ3M7CiB0ZXN0KCJfYXBwZW5kUGVuZGluZ1Jldmlz aW9uQ291bnQiLCBmdW5jdGlvbigpCiB7Ci0gICAgdHJhYyA9IG5ldyBNb2NrVHJhYygpOwotICAg IHZhciBxdWV1ZSA9IG5ldyBNb2NrQnVpbGRib3RRdWV1ZSgpOwotICAgIHF1ZXVlLmJyYW5jaGVz ID0gW3sKLSAgICAgICAgbmFtZTogInRydW5rIiwKLSAgICAgICAgcmVwb3NpdG9yeTogewotICAg ICAgICAgICAgbmFtZTogIm9wZW5Tb3VyY2UiLAotICAgICAgICAgICAgdHJhYzogdHJhYwotICAg ICAgICB9Ci0gICAgfV0KLSAgICB2YXIgdmlldyA9IG5ldyBNb2NrQnVpbGRib3RRdWV1ZVZpZXco W3F1ZXVlXSk7Ci0gICAgdmlldy5fYXBwZW5kUGVuZGluZ1JldmlzaW9uQ291bnQocXVldWUpOwot ICAgIHZhciByZXZpc2lvbnNCZWhpbmQgPSB2aWV3LmVsZW1lbnQuZ2V0RWxlbWVudHNCeUNsYXNz TmFtZSgibWVzc2FnZSIpWzBdLmlubmVySFRNTC5tYXRjaCgvLiooXGQrKSByZXZpc2lvbih8cykg YmVoaW5kLylbMV07CisgICAgdGhpcy52aWV3Ll9hcHBlbmRQZW5kaW5nUmV2aXNpb25Db3VudCh0 aGlzLnF1ZXVlKTsKKyAgICB2YXIgcmV2aXNpb25zQmVoaW5kID0gdGhpcy52aWV3LmVsZW1lbnQu Z2V0RWxlbWVudHNCeUNsYXNzTmFtZSgibWVzc2FnZSIpWzBdLmlubmVySFRNTC5tYXRjaCgvLioo XGQrKSByZXZpc2lvbih8cykgYmVoaW5kLylbMV07CiAgICAgZXF1YWwocmV2aXNpb25zQmVoaW5k LCAiMSIsICJhc3NlcnQgcmV2aXNpb25zIGJlaGluZCIpOwogfSk7CiAKK3Rlc3QoIl9wb3BvdmVy TGluZXNGb3JDb21taXRSYW5nZSIsIGZ1bmN0aW9uKCkKK3sKKyAgICB2YXIgbGluZXMgPSB0aGlz LnZpZXcuX3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJhbmdlKHRoaXMudHJhYywgdGhpcy50cnVua0Jy YW5jaCwgMzMwMTgsIDMzMDIwKTsKKyAgICBzdHJpY3RFcXVhbChsaW5lcy5sZW5ndGgsIDMsICJo YXMgMyBsaW5lcyIpOworfSk7CisKK3Rlc3QoIl9wcmVzZW50UG9wb3ZlckZvclBlbmRpbmdDb21t aXRzIiwgZnVuY3Rpb24oKQoreworICAgIHZhciBlbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2Iik7CisgICAgdmFyIHBvcG92ZXIgPSBuZXcgRGFzaGJvYXJkLlBvcG92ZXIoKTsK KyAgICB0aGlzLnZpZXcuX3ByZXNlbnRQb3BvdmVyRm9yUGVuZGluZ0NvbW1pdHMoZWxlbWVudCwg cG9wb3ZlciwgdGhpcy5xdWV1ZSk7CisgICAgdmFyIG5vZGVMaXN0ID0gcG9wb3Zlci5fZWxlbWVu dC5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJwZW5kaW5nLWNvbW1pdCIpOworICAgIHN0cmljdEVx dWFsKG5vZGVMaXN0Lmxlbmd0aCwgMSwgImhhcyAxIHBlbmRpbmcgY29tbWl0Iik7Cit9KTsKKwor dGVzdCgiX3ByZXNlbnRQb3BvdmVyRm9yUmV2aXNpb25SYW5nZSIsIGZ1bmN0aW9uKCkKK3sKKyAg ICB2YXIgZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHZhciBw b3BvdmVyID0gbmV3IERhc2hib2FyZC5Qb3BvdmVyKCk7CisgICAgdmFyIGNvbnRleHQgPSB7Cisg ICAgICAgIHRyYWM6IHRoaXMudHJhYywKKyAgICAgICAgYnJhbmNoOiB0aGlzLnRydW5rQnJhbmNo LAorICAgICAgICBmaXJzdFJldmlzaW9uOiAzMzAxOCwKKyAgICAgICAgbGFzdFJldmlzaW9uOiAz MzAyMAorICAgIH07CisgICAgdGhpcy52aWV3Ll9wcmVzZW50UG9wb3ZlckZvclJldmlzaW9uUmFu Z2UoZWxlbWVudCwgcG9wb3ZlciwgY29udGV4dCk7CisgICAgdmFyIG5vZGVMaXN0ID0gcG9wb3Zl ci5fZWxlbWVudC5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJwZW5kaW5nLWNvbW1pdCIpOworICAg IHN0cmljdEVxdWFsKG5vZGVMaXN0Lmxlbmd0aCwgMywgImhhcyAzIGNvbW1pdHMiKTsKK30pOwor Cit0ZXN0KCJfcHJlc2VudFBvcG92ZXJGb3JSZXZpc2lvblJhbmdlIG5vIGNvbW1pdHMiLCBmdW5j dGlvbigpCit7CisgICAgdmFyIGVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYi KTsKKyAgICB2YXIgcG9wb3ZlciA9IG5ldyBEYXNoYm9hcmQuUG9wb3ZlcigpOworICAgIHZhciBj b250ZXh0ID0geworICAgICAgICB0cmFjOiB0aGlzLnRyYWMsCisgICAgICAgIGJyYW5jaDogdGhp cy50cnVua0JyYW5jaCwKKyAgICAgICAgZmlyc3RSZXZpc2lvbjogMzMwMjAsCisgICAgICAgIGxh c3RSZXZpc2lvbjogMzMwMTgKKyAgICB9OworICAgIHRoaXMudmlldy5fcHJlc2VudFBvcG92ZXJG b3JSZXZpc2lvblJhbmdlKGVsZW1lbnQsIHBvcG92ZXIsIGNvbnRleHQpOworICAgIHZhciBub2Rl TGlzdCA9IHBvcG92ZXIuX2VsZW1lbnQuZ2V0RWxlbWVudHNCeUNsYXNzTmFtZSgicGVuZGluZy1j b21taXQiKTsKKyAgICBzdHJpY3RFcXVhbChub2RlTGlzdC5sZW5ndGgsIDAsICJoYXMgMCBjb21t aXRzIik7Cit9KTsKKwordGVzdCgiX3JldmlzaW9uQ29udGVudFdpdGhQb3BvdmVyRm9ySXRlcmF0 aW9uIiwgZnVuY3Rpb24oKQoreworICAgIHZhciBmaW5pc2hlZCA9IGZhbHNlOworICAgIHZhciBp dGVyYXRpb24gPSBuZXcgQnVpbGRib3RJdGVyYXRpb24odGhpcy5xdWV1ZSwgMSwgZmluaXNoZWQp OworICAgIGl0ZXJhdGlvbi5yZXZpc2lvbiA9IHsgIm9wZW5Tb3VyY2UiOiAzMzAxOCB9OworICAg IHZhciBwcmV2aW91c0l0ZXJhdGlvbiA9IG51bGw7CisgICAgdmFyIGJyYW5jaCA9IHRoaXMudHJ1 bmtCcmFuY2g7CisgICAgdmFyIGNvbnRlbnQgPSB0aGlzLnZpZXcuX3JldmlzaW9uQ29udGVudFdp dGhQb3BvdmVyRm9ySXRlcmF0aW9uKGl0ZXJhdGlvbiwgcHJldmlvdXNJdGVyYXRpb24sIGJyYW5j aCk7CisgICAgc3RyaWN0RXF1YWwoY29udGVudC5pbm5lckhUTUwsICJyMzMwMTgiLCAic2hvdWxk IGhhdmUgY29ycmVjdCByZXZpc2lvbiBudW1iZXIuIik7CisgICAgc3RyaWN0RXF1YWwoY29udGVu dC5jbGFzc0xpc3QuY29udGFpbnMoInJldmlzaW9uLW51bWJlciIpLCB0cnVlLCAic2hvdWxkIGhh dmUgY2xhc3MgJ3JldmlzaW9uLW51bWJlcicuIik7Cit9KTsKKwordGVzdCgiX3JldmlzaW9uQ29u dGVudFdpdGhQb3BvdmVyRm9ySXRlcmF0aW9uIGhhcyBwcmV2aW91c0l0ZXJhdGlvbiIsIGZ1bmN0 aW9uKCkKK3sKKyAgICB2YXIgZmluaXNoZWQgPSBmYWxzZTsKKyAgICB2YXIgaXRlcmF0aW9uID0g bmV3IEJ1aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUsIDIsIGZpbmlzaGVkKTsKKyAgICBpdGVy YXRpb24ucmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogMzMwMjIgfTsKKyAgICB2YXIgcHJldmlv dXNJdGVyYXRpb24gPSBuZXcgQnVpbGRib3RJdGVyYXRpb24odGhpcy5xdWV1ZSwgMSwgZmluaXNo ZWQpOworICAgIHByZXZpb3VzSXRlcmF0aW9uLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6IDMz MDE4IH07CisgICAgdmFyIGJyYW5jaCA9IHRoaXMudHJ1bmtCcmFuY2g7CisgICAgdmFyIGNvbnRl bnQgPSB0aGlzLnZpZXcuX3JldmlzaW9uQ29udGVudFdpdGhQb3BvdmVyRm9ySXRlcmF0aW9uKGl0 ZXJhdGlvbiwgcHJldmlvdXNJdGVyYXRpb24sIGJyYW5jaCk7CisgICAgc3RyaWN0RXF1YWwoY29u dGVudC5pbm5lckhUTUwsICJyMzMwMjIiLCAic2hvdWxkIGhhdmUgY29ycmVjdCByZXZpc2lvbiBu dW1iZXIuIik7CisgICAgc3RyaWN0RXF1YWwoY29udGVudC5jbGFzc0xpc3QuY29udGFpbnMoInJl dmlzaW9uLW51bWJlciIpLCB0cnVlLCAic2hvdWxkIGhhdmUgY2xhc3MgJ3JldmlzaW9uLW51bWJl cicuIik7CisgICAgc3RyaWN0RXF1YWwoY29udGVudC5jbGFzc0xpc3QuY29udGFpbnMoInBvcG92 ZXItdHJhY2tpbmciKSwgdHJ1ZSwgInNob3VsZCBoYXZlIGNsYXNzICdwb3BvdmVyLXRyYWNraW5n Jy4iKTsKK30pOworCiBtb2R1bGUoIkJ1aWxkQm90UXVldWUiLCB7CiAgICAgc2V0dXA6IGZ1bmN0 aW9uKCkgewogICAgICAgICB0aGlzLnF1ZXVlID0gbmV3IE1vY2tCdWlsZGJvdFF1ZXVlKCk7Cg== 269586 2016-01-22 11:09:21 -0800 2016-01-27 13:50:25 -0800 Patch bug-153330-20160122110854.patch text/plain 10879 jmarcell U3VidmVyc2lvbiBSZXZpc2lvbjogMTk1NDYxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGRiNTgzM2E1MDBlNGVkMWUyM2I3NzJhN2I3MDExMTk1 ZTc2YTg4Yi4uM2Q3Njk3ZWNmZDEyYWNlZDgyZWU1YWRlMmY3N2QyYWJiZjhiYmMzMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3 IEBACiAyMDE2LTAxLTIxICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgogCisg ICAgICAgIEZpeCBidWdzIGNhdXNlZCBieSBpbmNvcnJlY3QgdXNhZ2Ugb2YgImJyYW5jaCIgdnMu ICJicmFuY2hOYW1lIi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1MzMzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEluIGFuIGVhcmxpZXIgcGF0Y2ggd2Ugc3RhcnRlZCB1c2luZyB0aGUgbmFtZSAiYnJh bmNoIiB0byBpbmRpY2F0ZSBhIGJyYW5jaCBvYmplY3QsIHdoZXJlYXMKKyAgICAgICAgImJyYW5j aE5hbWUiIGltcGxpZXMgdGhhdCB0aGUgdmFyaWFibGUgb3IgcHJvcGVydHkgaW4gcXVlc3Rpb24g aXMgc2ltcGx5IGEgc3RyaW5nLiBXZSBmaXhlZCBzb21lCisgICAgICAgIGluY29uc2lzdGVuY2ll cyByZWdhcmRpbmcgdGhpcyBpc3N1ZSBpbiAxNTI5ODIgYnV0IGZ1cnRoZXIgYnVncyBhbmQgaW5j b25zaXN0ZW5jaWVzIHdlcmUgcmVjZW50bHkKKyAgICAgICAgc3BvdHRlZCBpbiBCdWlsZGJvdFF1 ZXVlVmlldy5qcy4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3 LmpzOgorICAgICAgICAoQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlLl9wb3BvdmVyTGluZXNG b3JDb21taXRSYW5nZSk6IENoYW5nZSBicmFuY2hOYW1lIHRvIGJyYW5jaCBpbiBtZXRob2Qgc2ln bmF0dXJlLgorICAgICAgICBDaGFuZ2VkIGJyYW5jaE5hbWUgdG8gYnJhbmNoLm5hbWUgaW4gY2Fs bCB0byBjb21taXRzT25CcmFuY2guCisgICAgICAgIChCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5 cGUuX3ByZXNlbnRQb3BvdmVyRm9yUGVuZGluZ0NvbW1pdHMpOiBDaGFuZ2UgYnJhbmNoLm5hbWUg dG8gYnJhbmNoIGluIGNhbGwgdG8KKyAgICAgICAgX3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJhbmdl LgorICAgICAgICAoQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlLl9wcmVzZW50UG9wb3ZlckZv clJldmlzaW9uUmFuZ2UpOiBDaGFuZ2VkIGNvbnRleHQuYnJhbmNoTmFtZSB0byBjb250ZXh0LmJy YW5jaC5uYW1lLgorICAgICAgICAoQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlLl9yZXZpc2lv bkNvbnRlbnRXaXRoUG9wb3ZlckZvckl0ZXJhdGlvbik6IENoYW5nZWQgYnJhbmNoLm5hbWUgdG8g YnJhbmNoLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL3Rlc3RzLmpzOiBBZGRlZCB0 ZXN0cyB0byB2ZXJpZnkKKyAgICAgICAgZml4LgorCisyMDE2LTAxLTIxICBKYXNvbiBNYXJjZWxs ICA8am1hcmNlbGxAYXBwbGUuY29tPgorCiAgICAgICAgIFJlZmFjdG9yIGxvZ2ljIGZvciBwYXJz aW5nIFRyYWMgcmV2aXNpb25zIGludG8gaXRzIG93biBmdW5jdGlvbiBhbmQgYWRkIGxvZ2ljIGZv ciBwYXJzaW5nIGdpdCBoYXNoZXMuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTMzMzIKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMv QnVpbGRib3RRdWV1ZVZpZXcuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVl Vmlldy5qcwppbmRleCAyM2I5ZDA3MGU5YTU5ODVkMDBkNGY4M2Q2MjM1Y2FkYzUzOTBlZWZiLi44 YjVmMGI5YWIwNjk1ZTg5NGYxYmQxMGUwNmJlNjI5ZWZjNDU5Yzk5IDEwMDY0NAotLS0gYS9Ub29s cy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9k YXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qcworKysgYi9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQv U2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qcwpAQCAtMTEwLDcgKzExMCw3IEBAIEJ1aWxkYm90 UXVldWVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgbmV3IFBvcG92ZXJUcmFja2VyKG1lc3Nh Z2VFbGVtZW50LCB0aGlzLl9wcmVzZW50UG9wb3ZlckZvclBlbmRpbmdDb21taXRzLmJpbmQodGhp cyksIHF1ZXVlKTsKICAgICB9LAogCi0gICAgX3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJhbmdlOiBm dW5jdGlvbih0cmFjLCBicmFuY2hOYW1lLCBmaXJzdFJldmlzaW9uTnVtYmVyLCBsYXN0UmV2aXNp b25OdW1iZXIpCisgICAgX3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJhbmdlOiBmdW5jdGlvbih0cmFj LCBicmFuY2gsIGZpcnN0UmV2aXNpb25OdW1iZXIsIGxhc3RSZXZpc2lvbk51bWJlcikKICAgICB7 CiAgICAgICAgIGZ1bmN0aW9uIGxpbmVGb3JDb21taXQodHJhYywgY29tbWl0KQogICAgICAgICB7 CkBAIC0xNDEsNyArMTQxLDcgQEAgQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlID0gewogCiAg ICAgICAgIC8vIEZJWE1FOiBUbyBiZSAxMDAlIGNvcnJlY3QsIHdlIHNob3VsZCBhbHNvIGZpbHRl ciBvdXQgY2hhbmdlcyB0aGF0IGFyZSBpZ25vcmVkIGJ5CiAgICAgICAgIC8vIHRoZSBxdWV1ZSwg c2VlIF9zaG91bGRfZmlsZV90cmlnZ2VyX2J1aWxkIGluIHdrYnVpbGQucHkuCi0gICAgICAgIHZh ciBjb21taXRzID0gdHJhYy5jb21taXRzT25CcmFuY2goYnJhbmNoTmFtZSwgZnVuY3Rpb24oY29t bWl0KSB7IHJldHVybiBjb21taXQucmV2aXNpb25OdW1iZXIgPj0gZmlyc3RSZXZpc2lvbk51bWJl ciAmJiBjb21taXQucmV2aXNpb25OdW1iZXIgPD0gbGFzdFJldmlzaW9uTnVtYmVyOyB9KTsKKyAg ICAgICAgdmFyIGNvbW1pdHMgPSB0cmFjLmNvbW1pdHNPbkJyYW5jaChicmFuY2gubmFtZSwgZnVu Y3Rpb24oY29tbWl0KSB7IHJldHVybiBjb21taXQucmV2aXNpb25OdW1iZXIgPj0gZmlyc3RSZXZp c2lvbk51bWJlciAmJiBjb21taXQucmV2aXNpb25OdW1iZXIgPD0gbGFzdFJldmlzaW9uTnVtYmVy OyB9KTsKICAgICAgICAgcmV0dXJuIGNvbW1pdHMubWFwKGZ1bmN0aW9uKGNvbW1pdCkgewogICAg ICAgICAgICAgcmV0dXJuIGxpbmVGb3JDb21taXQodHJhYywgY29tbWl0KTsKICAgICAgICAgfSwg dGhpcykucmV2ZXJzZSgpOwpAQCAtMTY2LDcgKzE2Niw3IEBAIEJ1aWxkYm90UXVldWVWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZhciBsYXRlc3RQcm9kdWN0aXZlUmV2aXNpb25OdW1i ZXIgPSBsYXRlc3RQcm9kdWN0aXZlSXRlcmF0aW9uLnJldmlzaW9uW3JlcG9zaXRvcnlOYW1lXTsK ICAgICAgICAgICAgIGlmICghbGF0ZXN0UHJvZHVjdGl2ZVJldmlzaW9uTnVtYmVyIHx8ICF0cmFj LmxhdGVzdFJlY29yZGVkUmV2aXNpb25OdW1iZXIpCiAgICAgICAgICAgICAgICAgY29udGludWU7 Ci0gICAgICAgICAgICB2YXIgbGluZXMgPSB0aGlzLl9wb3BvdmVyTGluZXNGb3JDb21taXRSYW5n ZSh0cmFjLCBicmFuY2gubmFtZSwgbGF0ZXN0UHJvZHVjdGl2ZVJldmlzaW9uTnVtYmVyICsgMSwg dHJhYy5sYXRlc3RSZWNvcmRlZFJldmlzaW9uTnVtYmVyKTsKKyAgICAgICAgICAgIHZhciBsaW5l cyA9IHRoaXMuX3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJhbmdlKHRyYWMsIGJyYW5jaCwgbGF0ZXN0 UHJvZHVjdGl2ZVJldmlzaW9uTnVtYmVyICsgMSwgdHJhYy5sYXRlc3RSZWNvcmRlZFJldmlzaW9u TnVtYmVyKTsKICAgICAgICAgICAgIHZhciBsZW5ndGggPSBsaW5lcy5sZW5ndGg7CiAgICAgICAg ICAgICBpZiAobGVuZ3RoICYmIHNob3VsZEFkZERpdmlkZXIpCiAgICAgICAgICAgICAgICAgdGhp cy5fYWRkRGl2aWRlclRvUG9wb3Zlcihjb250ZW50KTsKQEAgLTE4OCw3ICsxODgsNyBAQCBCdWls ZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGNvbnRlbnQuY2xhc3NOYW1lID0g ImNvbW1pdC1oaXN0b3J5LXBvcG92ZXIiOwogCiAgICAgICAgIC8vIEZJWE1FOiBOb3RoaW5nIGd1 YXJhbnRlZXMgdGhhdCBUcmFjIGhhcyBoaXN0b3JpY2FsIGRhdGEgZm9yIHRoZXNlIHJldmlzaW9u cy4KLSAgICAgICAgdmFyIGxpbmVzRm9yQ29tbWl0cyA9IHRoaXMuX3BvcG92ZXJMaW5lc0ZvckNv bW1pdFJhbmdlKGNvbnRleHQudHJhYywgY29udGV4dC5icmFuY2hOYW1lLCBjb250ZXh0LmZpcnN0 UmV2aXNpb24sIGNvbnRleHQubGFzdFJldmlzaW9uKTsKKyAgICAgICAgdmFyIGxpbmVzRm9yQ29t bWl0cyA9IHRoaXMuX3BvcG92ZXJMaW5lc0ZvckNvbW1pdFJhbmdlKGNvbnRleHQudHJhYywgY29u dGV4dC5icmFuY2gsIGNvbnRleHQuZmlyc3RSZXZpc2lvbiwgY29udGV4dC5sYXN0UmV2aXNpb24p OwogCiAgICAgICAgIHZhciBsaW5lID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAg ICAgICAgIGxpbmUuY2xhc3NOYW1lID0gInRpdGxlIjsKQEAgLTE5OCw3ICsxOTgsNyBAQCBCdWls ZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjb250ZW50LmFwcGVuZENo aWxkKGxpbmUpOwogICAgICAgICAgICAgdGhpcy5fYWRkRGl2aWRlclRvUG9wb3Zlcihjb250ZW50 KTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGxpbmUudGV4dENvbnRlbnQgPSAibm8g Y29tbWl0cyB0byAiICsgY29udGV4dC5icmFuY2hOYW1lICsgIiBzaW5jZSBwcmV2aW91cyByZXN1 bHQiOworICAgICAgICAgICAgbGluZS50ZXh0Q29udGVudCA9ICJubyBjb21taXRzIHRvICIgKyBj b250ZXh0LmJyYW5jaC5uYW1lICsgIiBzaW5jZSBwcmV2aW91cyByZXN1bHQiOwogICAgICAgICAg ICAgY29udGVudC5hcHBlbmRDaGlsZChsaW5lKTsKICAgICAgICAgfQogCkBAIC0yMzIsNyArMjMy LDcgQEAgQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgY29uc29s ZS5hc3NlcnQocHJldmlvdXNJdGVyYXRpb24ucmV2aXNpb25bcmVwb3NpdG9yeU5hbWVdKTsKICAg ICAgICAgICAgIHZhciBjb250ZXh0ID0gewogICAgICAgICAgICAgICAgIHRyYWM6IHJlcG9zaXRv cnkudHJhYywKLSAgICAgICAgICAgICAgICBicmFuY2hOYW1lOiBicmFuY2gubmFtZSwKKyAgICAg ICAgICAgICAgICBicmFuY2g6IGJyYW5jaCwKICAgICAgICAgICAgICAgICBmaXJzdFJldmlzaW9u OiBwcmV2aW91c0l0ZXJhdGlvbi5yZXZpc2lvbltyZXBvc2l0b3J5TmFtZV0gKyAxLAogICAgICAg ICAgICAgICAgIGxhc3RSZXZpc2lvbjogaXRlcmF0aW9uLnJldmlzaW9uW3JlcG9zaXRvcnlOYW1l XQogICAgICAgICAgICAgfTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3Rz L3Rlc3RzLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdHMuanMKaW5kZXggOTRl MjQ2OTNkNDQ2ZDU0MDEyYWJhZWU1MDk1ZTkzMjVlNzcyZDJlZi4uNmQzNzJiMjU2Y2FlNjRlMjk0 YzBhOGFiZmJhMjQyZWRiNjhlMjFjMyAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMv dGVzdHMvdGVzdHMuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdHMuanMK QEAgLTM2LDI2ICszNiwxMDMgQEAgdGVzdCgiX3BhcnNlUmV2aXNpb25Gcm9tVVJMIiwgZnVuY3Rp b24oKQogICAgIGVxdWFsKHRoaXMudHJhYy5fcGFyc2VSZXZpc2lvbkZyb21VUkwoImh0dHBzOi8v Z2l0LmZvb2Jhci5jb20vdHJhYy9XaGF0ZXZlci5naXQvY2hhbmdlc2V0LzBlNDk4ZGI1ZDhlNWI1 YTM0MjYzMSIpLCAiMGU0OThkYjVkOGU1YjVhMzQyNjMxIiwgIkdpdCIpOwogfSk7CiAKLW1vZHVs ZSgiQnVpbGRCb3RRdWV1ZVZpZXciKTsKK21vZHVsZSgiQnVpbGRCb3RRdWV1ZVZpZXciLCB7Cisg ICAgc2V0dXA6IGZ1bmN0aW9uKCkgeworICAgICAgICB0aGlzLnRyYWMgPSBuZXcgTW9ja1RyYWMo KTsKKyAgICAgICAgdGhpcy5xdWV1ZSA9IG5ldyBNb2NrQnVpbGRib3RRdWV1ZSgpOworICAgICAg ICB0aGlzLnRydW5rQnJhbmNoID0geworICAgICAgICAgICAgbmFtZTogInRydW5rIiwKKyAgICAg ICAgICAgIHJlcG9zaXRvcnk6IHsKKyAgICAgICAgICAgICAgICBuYW1lOiAib3BlblNvdXJjZSIs CisgICAgICAgICAgICAgICAgdHJhYzogdGhpcy50cmFjLAorICAgICAgICAgICAgICAgIGlzU1ZO OiB0cnVlLAorICAgICAgICAgICAgfQorICAgICAgICB9OworICAgICAgICB0aGlzLnF1ZXVlLmJy YW5jaGVzID0gW3RoaXMudHJ1bmtCcmFuY2hdOworICAgICAgICB0aGlzLnZpZXcgPSBuZXcgTW9j a0J1aWxkYm90UXVldWVWaWV3KFt0aGlzLnF1ZXVlXSk7CisgICAgfQorfSk7CiAKIHZhciBzZXR0 aW5ncyA9IG5ldyBTZXR0aW5nczsKIHRlc3QoIl9hcHBlbmRQZW5kaW5nUmV2aXNpb25Db3VudCIs IGZ1bmN0aW9uKCkKIHsKLSAgICB0cmFjID0gbmV3IE1vY2tUcmFjKCk7Ci0gICAgdmFyIHF1ZXVl ID0gbmV3IE1vY2tCdWlsZGJvdFF1ZXVlKCk7Ci0gICAgcXVldWUuYnJhbmNoZXMgPSBbewotICAg ICAgICBuYW1lOiAidHJ1bmsiLAotICAgICAgICByZXBvc2l0b3J5OiB7Ci0gICAgICAgICAgICBu YW1lOiAib3BlblNvdXJjZSIsCi0gICAgICAgICAgICB0cmFjOiB0cmFjCi0gICAgICAgIH0KLSAg ICB9XQotICAgIHZhciB2aWV3ID0gbmV3IE1vY2tCdWlsZGJvdFF1ZXVlVmlldyhbcXVldWVdKTsK LSAgICB2aWV3Ll9hcHBlbmRQZW5kaW5nUmV2aXNpb25Db3VudChxdWV1ZSk7Ci0gICAgdmFyIHJl dmlzaW9uc0JlaGluZCA9IHZpZXcuZWxlbWVudC5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJtZXNz YWdlIilbMF0uaW5uZXJIVE1MLm1hdGNoKC8uKihcZCspIHJldmlzaW9uKHxzKSBiZWhpbmQvKVsx XTsKKyAgICB0aGlzLnZpZXcuX2FwcGVuZFBlbmRpbmdSZXZpc2lvbkNvdW50KHRoaXMucXVldWUp OworICAgIHZhciByZXZpc2lvbnNCZWhpbmQgPSB0aGlzLnZpZXcuZWxlbWVudC5nZXRFbGVtZW50 c0J5Q2xhc3NOYW1lKCJtZXNzYWdlIilbMF0uaW5uZXJIVE1MLm1hdGNoKC8uKihcZCspIHJldmlz aW9uKHxzKSBiZWhpbmQvKVsxXTsKICAgICBlcXVhbChyZXZpc2lvbnNCZWhpbmQsICIxIiwgImFz c2VydCByZXZpc2lvbnMgYmVoaW5kIik7CiB9KTsKIAordGVzdCgiX3BvcG92ZXJMaW5lc0ZvckNv bW1pdFJhbmdlIiwgZnVuY3Rpb24oKQoreworICAgIHZhciBsaW5lcyA9IHRoaXMudmlldy5fcG9w b3ZlckxpbmVzRm9yQ29tbWl0UmFuZ2UodGhpcy50cmFjLCB0aGlzLnRydW5rQnJhbmNoLCAzMzAx OCwgMzMwMjApOworICAgIHN0cmljdEVxdWFsKGxpbmVzLmxlbmd0aCwgMywgImhhcyAzIGxpbmVz Iik7Cit9KTsKKwordGVzdCgiX3ByZXNlbnRQb3BvdmVyRm9yUGVuZGluZ0NvbW1pdHMiLCBmdW5j dGlvbigpCit7CisgICAgdmFyIGVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYi KTsKKyAgICB2YXIgcG9wb3ZlciA9IG5ldyBEYXNoYm9hcmQuUG9wb3ZlcigpOworICAgIHRoaXMu dmlldy5fcHJlc2VudFBvcG92ZXJGb3JQZW5kaW5nQ29tbWl0cyhlbGVtZW50LCBwb3BvdmVyLCB0 aGlzLnF1ZXVlKTsKKyAgICB2YXIgbm9kZUxpc3QgPSBwb3BvdmVyLl9lbGVtZW50LmdldEVsZW1l bnRzQnlDbGFzc05hbWUoInBlbmRpbmctY29tbWl0Iik7CisgICAgc3RyaWN0RXF1YWwobm9kZUxp c3QubGVuZ3RoLCAxLCAiaGFzIDEgcGVuZGluZyBjb21taXQiKTsKK30pOworCit0ZXN0KCJfcHJl c2VudFBvcG92ZXJGb3JSZXZpc2lvblJhbmdlIiwgZnVuY3Rpb24oKQoreworICAgIHZhciBlbGVt ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdmFyIHBvcG92ZXIgPSBu ZXcgRGFzaGJvYXJkLlBvcG92ZXIoKTsKKyAgICB2YXIgY29udGV4dCA9IHsKKyAgICAgICAgdHJh YzogdGhpcy50cmFjLAorICAgICAgICBicmFuY2g6IHRoaXMudHJ1bmtCcmFuY2gsCisgICAgICAg IGZpcnN0UmV2aXNpb246IDMzMDE4LAorICAgICAgICBsYXN0UmV2aXNpb246IDMzMDIwCisgICAg fTsKKyAgICB0aGlzLnZpZXcuX3ByZXNlbnRQb3BvdmVyRm9yUmV2aXNpb25SYW5nZShlbGVtZW50 LCBwb3BvdmVyLCBjb250ZXh0KTsKKyAgICB2YXIgbm9kZUxpc3QgPSBwb3BvdmVyLl9lbGVtZW50 LmdldEVsZW1lbnRzQnlDbGFzc05hbWUoInBlbmRpbmctY29tbWl0Iik7CisgICAgc3RyaWN0RXF1 YWwobm9kZUxpc3QubGVuZ3RoLCAzLCAiaGFzIDMgY29tbWl0cyIpOworfSk7CisKK3Rlc3QoIl9w cmVzZW50UG9wb3ZlckZvclJldmlzaW9uUmFuZ2Ugbm8gY29tbWl0cyIsIGZ1bmN0aW9uKCkKK3sK KyAgICB2YXIgZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHZh ciBwb3BvdmVyID0gbmV3IERhc2hib2FyZC5Qb3BvdmVyKCk7CisgICAgdmFyIGNvbnRleHQgPSB7 CisgICAgICAgIHRyYWM6IHRoaXMudHJhYywKKyAgICAgICAgYnJhbmNoOiB0aGlzLnRydW5rQnJh bmNoLAorICAgICAgICBmaXJzdFJldmlzaW9uOiAzMzAyMCwKKyAgICAgICAgbGFzdFJldmlzaW9u OiAzMzAxOAorICAgIH07CisgICAgdGhpcy52aWV3Ll9wcmVzZW50UG9wb3ZlckZvclJldmlzaW9u UmFuZ2UoZWxlbWVudCwgcG9wb3ZlciwgY29udGV4dCk7CisgICAgdmFyIG5vZGVMaXN0ID0gcG9w b3Zlci5fZWxlbWVudC5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJwZW5kaW5nLWNvbW1pdCIpOwor ICAgIHN0cmljdEVxdWFsKG5vZGVMaXN0Lmxlbmd0aCwgMCwgImhhcyAwIGNvbW1pdHMiKTsKK30p OworCit0ZXN0KCJfcmV2aXNpb25Db250ZW50V2l0aFBvcG92ZXJGb3JJdGVyYXRpb24iLCBmdW5j dGlvbigpCit7CisgICAgdmFyIGZpbmlzaGVkID0gZmFsc2U7CisgICAgdmFyIGl0ZXJhdGlvbiA9 IG5ldyBCdWlsZGJvdEl0ZXJhdGlvbih0aGlzLnF1ZXVlLCAxLCBmaW5pc2hlZCk7CisgICAgaXRl cmF0aW9uLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6IDMzMDE4IH07CisgICAgdmFyIHByZXZp b3VzSXRlcmF0aW9uID0gbnVsbDsKKyAgICB2YXIgYnJhbmNoID0gdGhpcy50cnVua0JyYW5jaDsK KyAgICB2YXIgY29udGVudCA9IHRoaXMudmlldy5fcmV2aXNpb25Db250ZW50V2l0aFBvcG92ZXJG b3JJdGVyYXRpb24oaXRlcmF0aW9uLCBwcmV2aW91c0l0ZXJhdGlvbiwgYnJhbmNoKTsKKyAgICBz dHJpY3RFcXVhbChjb250ZW50LmlubmVySFRNTCwgInIzMzAxOCIsICJzaG91bGQgaGF2ZSBjb3Jy ZWN0IHJldmlzaW9uIG51bWJlci4iKTsKKyAgICBzdHJpY3RFcXVhbChjb250ZW50LmNsYXNzTGlz dC5jb250YWlucygicmV2aXNpb24tbnVtYmVyIiksIHRydWUsICJzaG91bGQgaGF2ZSBjbGFzcyAn cmV2aXNpb24tbnVtYmVyJy4iKTsKKyAgICBzdHJpY3RFcXVhbChjb250ZW50LmNsYXNzTGlzdC5j b250YWlucygicG9wb3Zlci10cmFja2luZyIpLCBmYWxzZSwgInNob3VsZCBub3QgaGF2ZSBjbGFz cyAncG9wb3Zlci10cmFja2luZycuIik7Cit9KTsKKwordGVzdCgiX3JldmlzaW9uQ29udGVudFdp dGhQb3BvdmVyRm9ySXRlcmF0aW9uIGhhcyBwcmV2aW91c0l0ZXJhdGlvbiIsIGZ1bmN0aW9uKCkK K3sKKyAgICB2YXIgZmluaXNoZWQgPSBmYWxzZTsKKyAgICB2YXIgaXRlcmF0aW9uID0gbmV3IEJ1 aWxkYm90SXRlcmF0aW9uKHRoaXMucXVldWUsIDIsIGZpbmlzaGVkKTsKKyAgICBpdGVyYXRpb24u cmV2aXNpb24gPSB7ICJvcGVuU291cmNlIjogMzMwMjIgfTsKKyAgICB2YXIgcHJldmlvdXNJdGVy YXRpb24gPSBuZXcgQnVpbGRib3RJdGVyYXRpb24odGhpcy5xdWV1ZSwgMSwgZmluaXNoZWQpOwor ICAgIHByZXZpb3VzSXRlcmF0aW9uLnJldmlzaW9uID0geyAib3BlblNvdXJjZSI6IDMzMDE4IH07 CisgICAgdmFyIGJyYW5jaCA9IHRoaXMudHJ1bmtCcmFuY2g7CisgICAgdmFyIGNvbnRlbnQgPSB0 aGlzLnZpZXcuX3JldmlzaW9uQ29udGVudFdpdGhQb3BvdmVyRm9ySXRlcmF0aW9uKGl0ZXJhdGlv biwgcHJldmlvdXNJdGVyYXRpb24sIGJyYW5jaCk7CisgICAgc3RyaWN0RXF1YWwoY29udGVudC5p bm5lckhUTUwsICJyMzMwMjIiLCAic2hvdWxkIGhhdmUgY29ycmVjdCByZXZpc2lvbiBudW1iZXIu Iik7CisgICAgc3RyaWN0RXF1YWwoY29udGVudC5jbGFzc0xpc3QuY29udGFpbnMoInJldmlzaW9u LW51bWJlciIpLCB0cnVlLCAic2hvdWxkIGhhdmUgY2xhc3MgJ3JldmlzaW9uLW51bWJlcicuIik7 CisgICAgc3RyaWN0RXF1YWwoY29udGVudC5jbGFzc0xpc3QuY29udGFpbnMoInBvcG92ZXItdHJh Y2tpbmciKSwgdHJ1ZSwgInNob3VsZCBoYXZlIGNsYXNzICdwb3BvdmVyLXRyYWNraW5nJy4iKTsK K30pOworCiBtb2R1bGUoIkJ1aWxkQm90UXVldWUiLCB7CiAgICAgc2V0dXA6IGZ1bmN0aW9uKCkg ewogICAgICAgICB0aGlzLnF1ZXVlID0gbmV3IE1vY2tCdWlsZGJvdFF1ZXVlKCk7Cg==