54675 2011-02-17 11:02:59 -0800 Web Inspector: highlighted line does not span horizonally in scripts panel while debugging. 2011-03-02 05:46:26 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned aandrey apavlov bweinstein joepeck keishi loislo pfeldman pmuellr podivilov rik timothy yurys oldest_to_newest 353028 0 pfeldman 2011-02-17 11:02:59 -0800 1. Load a script with horizontal scrollbar 2. Set breakpoint 3. Stop on breakpoint 4. Move scroller Expected - highlighted bar spans Actual - trimmed. 353036 1 yurys 2011-02-17 11:11:18 -0800 The same issue with error highlights. 360727 2 84400 aandrey 2011-03-02 04:45:29 -0800 Created attachment 84400 Patch 360739 3 84400 pfeldman 2011-03-02 05:10:22 -0800 Comment on attachment 84400 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=84400&action=review > Source/WebCore/inspector/front-end/TextViewer.js:684 > + this._container.tabIndex = 0; tabIndex is used to make element focusable so that it could receive keyboard input events. Do you need it for both components? 360743 4 84405 aandrey 2011-03-02 05:15:32 -0800 Created attachment 84405 Patch 360752 5 84405 podivilov 2011-03-02 05:46:17 -0800 Comment on attachment 84405 Patch Clearing flags on attachment: 84405 Committed r80119: <http://trac.webkit.org/changeset/80119> 360753 6 podivilov 2011-03-02 05:46:26 -0800 All reviewed patches have been landed. Closing bug. 84400 2011-03-02 04:45:29 -0800 2011-03-02 05:15:27 -0800 Patch bug-54675-20110302154527.patch text/plain 13578 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogNzk5OTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4NDAxYmMzMzNjNGNhMmJm ZTRiMmIxMThlMGQ2YWQ1YzA1MWM2MzkxLi5lMzdkZmU0MDVmNjJhYzJlYmViOGM4ZjhlYzFiNjJj ZWNjYTg0MDNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDMtMDIgIEFuZHJl eSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGhpZ2hsaWdodGVkIGxpbmUg ZG9lcyBub3Qgc3BhbiBob3Jpem9uYWxseSBpbiBzY3JpcHRzIHBhbmVsIHdoaWxlIGRlYnVnZ2lu Zy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0Njc1 CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUuX3N5bmNTY3JvbGwpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlLl9idWlsZENo dW5rcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90 b3R5cGUubWFrZUxpbmVBQ2h1bmspOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JH dXR0ZXJQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBhbmVs LnByb3RvdHlwZS5fZXhwYW5kQ2h1bmtzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yR3V0dGVyUGFuZWwucHJvdG90eXBlLnRleHRDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpblBhbmVsLnByb3RvdHlwZS5zZXQgcmVhZE9ubHkpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl9nZXRTZWxlY3Rpb24pOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl9zZWxlY3Rpb25U b1Bvc2l0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnBy b3RvdHlwZS5faGFuZGxlRE9NU3VidHJlZU1vZGlmaWVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5fYXBwbHlEb21VcGRhdGVzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5fdXBkYXRlQ2h1 bmtzRm9yUmFuZ2VzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIu Y3NzOgorICAgICAgICAoLmlubmVyLWNvbnRhaW5lcik6CisKIDIwMTEtMDMtMDEgIFN0ZXZlIEJs b2NrICA8c3RldmVibG9ja0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVt eSBPcmxvdy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv VGV4dFZpZXdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZp ZXdlci5qcwppbmRleCAwYzc4ZTU4YjZmZmRiZjRiMjBjZjhjZGE3Y2IwODFlZDcyYWExMjI0Li44 YzhjOTkzYWZlZTgzNTM5Zjg4OTdmMzJhN2I1M2E5ZWEwNmFhNzU2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCkBAIC0yMDQsOSArMjA0 LDkgQEAgV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlID0gewogCiAgICAgICAgICAg ICAvLyBIYW5kbGUgaG9yaXpvbnRhbCBzY3JvbGwgYmFyIGF0IHRoZSBib3R0b20gb2YgdGhlIG1h aW4gcGFuZWwuCiAgICAgICAgICAgICBpZiAoZ3V0dGVyRWxlbWVudC5vZmZzZXRIZWlnaHQgPiBt YWluRWxlbWVudC5jbGllbnRIZWlnaHQpCi0gICAgICAgICAgICAgICAgZ3V0dGVyRWxlbWVudC5z dHlsZS5zZXRQcm9wZXJ0eSgicGFkZGluZy1ib3R0b20iLCAoZ3V0dGVyRWxlbWVudC5vZmZzZXRI ZWlnaHQgLSBtYWluRWxlbWVudC5jbGllbnRIZWlnaHQpICsgInB4Iik7CisgICAgICAgICAgICAg ICAgdGhpcy5fZ3V0dGVyUGFuZWwuX2NvbnRhaW5lci5zdHlsZS5zZXRQcm9wZXJ0eSgicGFkZGlu Zy1ib3R0b20iLCAoZ3V0dGVyRWxlbWVudC5vZmZzZXRIZWlnaHQgLSBtYWluRWxlbWVudC5jbGll bnRIZWlnaHQpICsgInB4Iik7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgZ3V0 dGVyRWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgicGFkZGluZy1ib3R0b20iKTsKKyAgICAg ICAgICAgICAgICB0aGlzLl9ndXR0ZXJQYW5lbC5fY29udGFpbmVyLnN0eWxlLnJlbW92ZVByb3Bl cnR5KCJwYWRkaW5nLWJvdHRvbSIpOwogCiAgICAgICAgICAgICBndXR0ZXJFbGVtZW50LnNjcm9s bFRvcCA9IG1haW5FbGVtZW50LnNjcm9sbFRvcDsKICAgICAgICAgfS5iaW5kKHRoaXMpLCAwKTsK QEAgLTI3OCwxMyArMjc4LDEzIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVs LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMuYmVnaW5Eb21VcGRhdGVzKCk7CiAK LSAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CisgICAgICAgIHRoaXMuX2Nv bnRhaW5lci5yZW1vdmVDaGlsZHJlbigpOwogCiAgICAgICAgIHRoaXMuX3RleHRDaHVua3MgPSBb XTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl90ZXh0TW9kZWwubGluZXNDb3Vu dDsgaSArPSB0aGlzLl9kZWZhdWx0Q2h1bmtTaXplKSB7CiAgICAgICAgICAgICB2YXIgY2h1bmsg PSB0aGlzLl9jcmVhdGVOZXdDaHVuayhpLCBpICsgdGhpcy5fZGVmYXVsdENodW5rU2l6ZSk7CiAg ICAgICAgICAgICB0aGlzLl90ZXh0Q2h1bmtzLnB1c2goY2h1bmspOwotICAgICAgICAgICAgdGhp cy5lbGVtZW50LmFwcGVuZENoaWxkKGNodW5rLmVsZW1lbnQpOworICAgICAgICAgICAgdGhpcy5f Y29udGFpbmVyLmFwcGVuZENoaWxkKGNodW5rLmVsZW1lbnQpOwogICAgICAgICB9CiAKICAgICAg ICAgdGhpcy5fcmVwYWludEFsbCgpOwpAQCAtMzEzLDI0ICszMTMsMjQgQEAgV2ViSW5zcGVjdG9y LlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAobGluZU51 bWJlciA+IG9sZENodW5rLnN0YXJ0TGluZSkgewogICAgICAgICAgICAgdmFyIHByZWZpeENodW5r ID0gdGhpcy5fY3JlYXRlTmV3Q2h1bmsob2xkQ2h1bmsuc3RhcnRMaW5lLCBsaW5lTnVtYmVyKTsK ICAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3Muc3BsaWNlKGluc2VydEluZGV4KyssIDAsIHBy ZWZpeENodW5rKTsKLSAgICAgICAgICAgIHRoaXMuZWxlbWVudC5pbnNlcnRCZWZvcmUocHJlZml4 Q2h1bmsuZWxlbWVudCwgb2xkQ2h1bmsuZWxlbWVudCk7CisgICAgICAgICAgICB0aGlzLl9jb250 YWluZXIuaW5zZXJ0QmVmb3JlKHByZWZpeENodW5rLmVsZW1lbnQsIG9sZENodW5rLmVsZW1lbnQp OwogICAgICAgICB9CiAKICAgICAgICAgLy8gTGluZSBjaHVuay4KICAgICAgICAgdmFyIGxpbmVD aHVuayA9IHRoaXMuX2NyZWF0ZU5ld0NodW5rKGxpbmVOdW1iZXIsIGxpbmVOdW1iZXIgKyAxKTsK ICAgICAgICAgdGhpcy5fdGV4dENodW5rcy5zcGxpY2UoaW5zZXJ0SW5kZXgrKywgMCwgbGluZUNo dW5rKTsKLSAgICAgICAgdGhpcy5lbGVtZW50Lmluc2VydEJlZm9yZShsaW5lQ2h1bmsuZWxlbWVu dCwgb2xkQ2h1bmsuZWxlbWVudCk7CisgICAgICAgIHRoaXMuX2NvbnRhaW5lci5pbnNlcnRCZWZv cmUobGluZUNodW5rLmVsZW1lbnQsIG9sZENodW5rLmVsZW1lbnQpOwogCiAgICAgICAgIC8vIFN1 ZmZpeCBjaHVuay4KICAgICAgICAgaWYgKG9sZENodW5rLnN0YXJ0TGluZSArIG9sZENodW5rLmxp bmVzQ291bnQgPiBsaW5lTnVtYmVyICsgMSkgewogICAgICAgICAgICAgdmFyIHN1ZmZpeENodW5r ID0gdGhpcy5fY3JlYXRlTmV3Q2h1bmsobGluZU51bWJlciArIDEsIG9sZENodW5rLnN0YXJ0TGlu ZSArIG9sZENodW5rLmxpbmVzQ291bnQpOwogICAgICAgICAgICAgdGhpcy5fdGV4dENodW5rcy5z cGxpY2UoaW5zZXJ0SW5kZXgsIDAsIHN1ZmZpeENodW5rKTsKLSAgICAgICAgICAgIHRoaXMuZWxl bWVudC5pbnNlcnRCZWZvcmUoc3VmZml4Q2h1bmsuZWxlbWVudCwgb2xkQ2h1bmsuZWxlbWVudCk7 CisgICAgICAgICAgICB0aGlzLl9jb250YWluZXIuaW5zZXJ0QmVmb3JlKHN1ZmZpeENodW5rLmVs ZW1lbnQsIG9sZENodW5rLmVsZW1lbnQpOwogICAgICAgICB9CiAKICAgICAgICAgLy8gUmVtb3Zl IGVuY2xvc2luZyBjaHVuay4KICAgICAgICAgdGhpcy5fdGV4dENodW5rcy5zcGxpY2UoY2h1bmtO dW1iZXIsIDEpOwotICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGQob2xkQ2h1bmsuZWxl bWVudCk7CisgICAgICAgIHRoaXMuX2NvbnRhaW5lci5yZW1vdmVDaGlsZChvbGRDaHVuay5lbGVt ZW50KTsKIAogICAgICAgICBpZiAod2FzRXhwYW5kZWQpIHsKICAgICAgICAgICAgIGlmIChwcmVm aXhDaHVuaykKQEAgLTQ1Niw3ICs0NTYsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5r ZWRQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHRvdGFsOwog ICAgIH0sCi0gICAgCisKICAgICByZXNpemU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRo aXMuX3JlcGFpbnRBbGwoKTsKQEAgLTQ3Miw2ICs0NzIsMTAgQEAgV2ViSW5zcGVjdG9yLlRleHRF ZGl0b3JHdXR0ZXJQYW5lbCA9IGZ1bmN0aW9uKHRleHRNb2RlbCwgc3luY0RlY29yYXRpb25zRm9y TGluZUwKICAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsK ICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInRleHQtZWRpdG9yLWxpbmVzIjsKIAorICAg IHRoaXMuX2NvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRo aXMuX2NvbnRhaW5lci5jbGFzc05hbWUgPSAiaW5uZXItY29udGFpbmVyIjsKKyAgICB0aGlzLmVs ZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY29udGFpbmVyKTsKKwogICAgIHRoaXMuZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9zY3JvbGwuYmluZCh0aGlzKSwgZmFsc2Up OwogCiAgICAgdGhpcy5mcmVlQ2FjaGVkRWxlbWVudHMoKTsKQEAgLTQ5Myw2ICs0OTcsNyBAQCBX ZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsLnByb3RvdHlwZSA9IHsKICAgICB7CiAg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fdGV4dENodW5rcy5sZW5ndGg7ICsraSkK ICAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3NbaV0uZXhwYW5kZWQgPSAoZnJvbUluZGV4IDw9 IGkgJiYgaSA8IHRvSW5kZXgpOworICAgICAgICB0aGlzLmVsZW1lbnQuc3R5bGUuc2V0UHJvcGVy dHkoIndpZHRoIiwgdGhpcy5fY29udGFpbmVyLm9mZnNldFdpZHRoICsgInB4Iik7CiAgICAgfSwK IAogICAgIHRleHRDaGFuZ2VkOiBmdW5jdGlvbihvbGRSYW5nZSwgbmV3UmFuZ2UpCkBAIC01MTAs NyArNTE1LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICAgICAgaWYgKGNodW5rLnN0YXJ0TGluZSArIGNodW5rLmxpbmVzQ291 bnQgPD0gdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQpCiAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICAgICAgICAgIGNodW5rLmV4cGFuZGVkID0gZmFsc2U7Ci0gICAgICAgICAg ICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZUNoaWxkKGNodW5rLmVsZW1lbnQpOworICAgICAgICAg ICAgICAgIHRoaXMuX2NvbnRhaW5lci5yZW1vdmVDaGlsZChjaHVuay5lbGVtZW50KTsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3MubGVuZ3RoID0gY2h1bmtOdW1i ZXIgKyAxOwogCkBAIC01MjMsNyArNTI4LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0 ZXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gdG90YWxMaW5l czsgaSA8IHRoaXMuX3RleHRNb2RlbC5saW5lc0NvdW50OyBpICs9IHRoaXMuX2RlZmF1bHRDaHVu a1NpemUpIHsKICAgICAgICAgICAgICAgICB2YXIgY2h1bmsgPSB0aGlzLl9jcmVhdGVOZXdDaHVu ayhpLCBpICsgdGhpcy5fZGVmYXVsdENodW5rU2l6ZSk7CiAgICAgICAgICAgICAgICAgdGhpcy5f dGV4dENodW5rcy5wdXNoKGNodW5rKTsKLSAgICAgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYXBw ZW5kQ2hpbGQoY2h1bmsuZWxlbWVudCk7CisgICAgICAgICAgICAgICAgdGhpcy5fY29udGFpbmVy LmFwcGVuZENoaWxkKGNodW5rLmVsZW1lbnQpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAg dGhpcy5fcmVwYWludEFsbCgpOwogICAgICAgICB9IGVsc2UgewpAQCAtNjc0LDE5ICs2NzksMjQg QEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwgPSBmdW5jdGlvbih0ZXh0TW9kZWws IHVybCwgc3luY1Njcm9sbExpc3RlbmVyLAogICAgIHRoaXMuZWxlbWVudC5jbGFzc05hbWUgPSAi dGV4dC1lZGl0b3ItY29udGVudHMiOwogICAgIHRoaXMuZWxlbWVudC50YWJJbmRleCA9IDA7CiAK KyAgICB0aGlzLl9jb250YWluZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAg ICB0aGlzLl9jb250YWluZXIuY2xhc3NOYW1lID0gImlubmVyLWNvbnRhaW5lciI7CisgICAgdGhp cy5fY29udGFpbmVyLnRhYkluZGV4ID0gMDsKKyAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5fY29udGFpbmVyKTsKKwogICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJz Y3JvbGwiLCB0aGlzLl9zY3JvbGwuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgLy8gRklYTUU6 IFJlbW92ZSBvbGQgbGl2ZSBlZGl0aW5nIGZ1bmN0aW9uYWxpdHkgYW5kIFByZWZlcmVuY2VzLnNv dXJjZUVkaXRvckVuYWJsZWQgZmxhZy4KICAgICBpZiAoIVByZWZlcmVuY2VzLnNvdXJjZUVkaXRv ckVuYWJsZWQpCi0gICAgICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3du IiwgdGhpcy5faGFuZGxlS2V5RG93bi5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgICAgIHRoaXMu X2NvbnRhaW5lci5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5faGFuZGxlS2V5RG93 bi5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAgICB2YXIgaGFuZGxlRE9NVXBkYXRlcyA9IHRoaXMu X2hhbmRsZURPTVVwZGF0ZXMuYmluZCh0aGlzKTsKLSAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigiRE9NQ2hhcmFjdGVyRGF0YU1vZGlmaWVkIiwgaGFuZGxlRE9NVXBkYXRlcywgZmFs c2UpOwotICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJET01Ob2RlSW5zZXJ0ZWQi LCBoYW5kbGVET01VcGRhdGVzLCBmYWxzZSk7Ci0gICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoIkRPTU5vZGVSZW1vdmVkIiwgaGFuZGxlRE9NVXBkYXRlcywgZmFsc2UpOworICAgIHRo aXMuX2NvbnRhaW5lci5hZGRFdmVudExpc3RlbmVyKCJET01DaGFyYWN0ZXJEYXRhTW9kaWZpZWQi LCBoYW5kbGVET01VcGRhdGVzLCBmYWxzZSk7CisgICAgdGhpcy5fY29udGFpbmVyLmFkZEV2ZW50 TGlzdGVuZXIoIkRPTU5vZGVJbnNlcnRlZCIsIGhhbmRsZURPTVVwZGF0ZXMsIGZhbHNlKTsKKyAg ICB0aGlzLl9jb250YWluZXIuYWRkRXZlbnRMaXN0ZW5lcigiRE9NTm9kZVJlbW92ZWQiLCBoYW5k bGVET01VcGRhdGVzLCBmYWxzZSk7CiAgICAgLy8gRm9yIHNvbWUgcmVhc29ucywgaW4gYSBmZXcg Y29ybmVyIGNhc2VzIHRoZSBldmVudHMgYWJvdmUgYXJlIG5vdCBhYmxlIHRvIGNhdGNoIHRoZSBl ZGl0aW5ncy4KICAgICAvLyBUbyB3b3JrYXJvdW5kIHRoYXQgd2UgYWxzbyBsaXN0ZW4gdG8gYSBt b3JlIGdlbmVyYWwgZXZlbnQgYXMgYSBiYWNrdXAuCi0gICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50 TGlzdGVuZXIoIkRPTVN1YnRyZWVNb2RpZmllZCIsIHRoaXMuX2hhbmRsZURPTVN1YnRyZWVNb2Rp ZmllZC5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgdGhpcy5fY29udGFpbmVyLmFkZEV2ZW50TGlz dGVuZXIoIkRPTVN1YnRyZWVNb2RpZmllZCIsIHRoaXMuX2hhbmRsZURPTVN1YnRyZWVNb2RpZmll ZC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAgICB0aGlzLmZyZWVDYWNoZWRFbGVtZW50cygpOwog ICAgIHRoaXMuX2J1aWxkQ2h1bmtzKCk7CkBAIC03MDcsOSArNzE3LDkgQEAgV2ViSW5zcGVjdG9y LlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmJlZ2luRG9t VXBkYXRlcygpOwogICAgICAgICB0aGlzLl9yZWFkT25seSA9IHJlYWRPbmx5OwogICAgICAgICBp ZiAodGhpcy5fcmVhZE9ubHkpCi0gICAgICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlU3R5bGVD bGFzcygidGV4dC1lZGl0b3ItZWRpdGFibGUiKTsKKyAgICAgICAgICAgIHRoaXMuX2NvbnRhaW5l ci5yZW1vdmVTdHlsZUNsYXNzKCJ0ZXh0LWVkaXRvci1lZGl0YWJsZSIpOwogICAgICAgICBlbHNl Ci0gICAgICAgICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygidGV4dC1lZGl0b3ItZWRp dGFibGUiKTsKKyAgICAgICAgICAgIHRoaXMuX2NvbnRhaW5lci5hZGRTdHlsZUNsYXNzKCJ0ZXh0 LWVkaXRvci1lZGl0YWJsZSIpOwogICAgICAgICB0aGlzLmVuZERvbVVwZGF0ZXMoKTsKICAgICB9 LAogCkBAIC05NzIsNyArOTgyLDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgICAgIHZhciBzZWxl Y3Rpb25SYW5nZSA9IHNlbGVjdGlvbi5nZXRSYW5nZUF0KDApOwogICAgICAgICAvLyBTZWxlY3Rp b24gbWF5IGJlIG91dHNpZGUgb2YgdGhlIHZpZXdlci4KLSAgICAgICAgaWYgKCF0aGlzLmVsZW1l bnQuaXNBbmNlc3RvcihzZWxlY3Rpb25SYW5nZS5zdGFydENvbnRhaW5lcikgfHwgIXRoaXMuZWxl bWVudC5pc0FuY2VzdG9yKHNlbGVjdGlvblJhbmdlLmVuZENvbnRhaW5lcikpCisgICAgICAgIGlm ICghdGhpcy5fY29udGFpbmVyLmlzQW5jZXN0b3Ioc2VsZWN0aW9uUmFuZ2Uuc3RhcnRDb250YWlu ZXIpIHx8ICF0aGlzLl9jb250YWluZXIuaXNBbmNlc3RvcihzZWxlY3Rpb25SYW5nZS5lbmRDb250 YWluZXIpKQogICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgICAgIHZhciBzdGFydCA9IHRo aXMuX3NlbGVjdGlvblRvUG9zaXRpb24oc2VsZWN0aW9uUmFuZ2Uuc3RhcnRDb250YWluZXIsIHNl bGVjdGlvblJhbmdlLnN0YXJ0T2Zmc2V0KTsKICAgICAgICAgdmFyIGVuZCA9IHNlbGVjdGlvblJh bmdlLmNvbGxhcHNlZCA/IHN0YXJ0IDogdGhpcy5fc2VsZWN0aW9uVG9Qb3NpdGlvbihzZWxlY3Rp b25SYW5nZS5lbmRDb250YWluZXIsIHNlbGVjdGlvblJhbmdlLmVuZE9mZnNldCk7CkBAIC05OTMs OSArMTAwMyw5IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9 IHsKIAogICAgIF9zZWxlY3Rpb25Ub1Bvc2l0aW9uOiBmdW5jdGlvbihjb250YWluZXIsIG9mZnNl dCkKICAgICB7Ci0gICAgICAgIGlmIChjb250YWluZXIgPT09IHRoaXMuZWxlbWVudCAmJiBvZmZz ZXQgPT09IDApCisgICAgICAgIGlmIChjb250YWluZXIgPT09IHRoaXMuX2NvbnRhaW5lciAmJiBv ZmZzZXQgPT09IDApCiAgICAgICAgICAgICByZXR1cm4geyBsaW5lOiAwLCBjb2x1bW46IDAgfTsK LSAgICAgICAgaWYgKGNvbnRhaW5lciA9PT0gdGhpcy5lbGVtZW50ICYmIG9mZnNldCA9PT0gMSkK KyAgICAgICAgaWYgKGNvbnRhaW5lciA9PT0gdGhpcy5fY29udGFpbmVyICYmIG9mZnNldCA9PT0g MSkKICAgICAgICAgICAgIHJldHVybiB7IGxpbmU6IHRoaXMuX3RleHRNb2RlbC5saW5lc0NvdW50 IC0gMSwgY29sdW1uOiB0aGlzLl90ZXh0TW9kZWwubGluZUxlbmd0aCh0aGlzLl90ZXh0TW9kZWwu bGluZXNDb3VudCAtIDEpIH07CiAKICAgICAgICAgdmFyIGxpbmVSb3cgPSBjb250YWluZXIuZW5j bG9zaW5nTm9kZU9yU2VsZldpdGhOb2RlTmFtZSgiRElWIik7CkBAIC0xMTExLDcgKzExMjEsNyBA QCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICByZXR1cm47CiAKICAgICAgICAgdmFyIHRhcmdldCA9IGUudGFyZ2V0OwotICAgICAgICBp ZiAodGFyZ2V0ID09PSB0aGlzLmVsZW1lbnQpCisgICAgICAgIGlmICh0YXJnZXQgPT09IHRoaXMu X2NvbnRhaW5lcikKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB2YXIgbGluZVJvdyA9 IHRhcmdldC5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aENsYXNzKCJ3ZWJraXQtbGluZS1jb250ZW50 Iik7CkBAIC0xMTU4LDcgKzExNjgsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5l bC5wcm90b3R5cGUgPSB7CiAKICAgICBfaGFuZGxlRE9NU3VidHJlZU1vZGlmaWVkOiBmdW5jdGlv bihlKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2RvbVVwZGF0ZUNvYWxlc2NpbmdMZXZlbCB8 fCB0aGlzLl9yZWFkT25seSB8fCBlLnRhcmdldCAhPT0gdGhpcy5lbGVtZW50KQorICAgICAgICBp ZiAodGhpcy5fZG9tVXBkYXRlQ29hbGVzY2luZ0xldmVsIHx8IHRoaXMuX3JlYWRPbmx5IHx8IGUu dGFyZ2V0ICE9PSB0aGlzLl9jb250YWluZXIpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAg ICAgLy8gUHJvY2VlZCBvbmx5IHdoZW4gb3RoZXIgZXZlbnRzIGZhaWxlZCB0byBjYXRjaCB0aGUg RE9NIHVwZGF0ZXMsIG90aGVyd2lzZSBpdCBpcyBub3QgbmVjZXNzYXJ5LgpAQCAtMTIxNyw3ICsx MjI3LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICAgICAgZmlyc3RMaW5lUm93ID0gY2h1bmsuZXhwYW5kZWQgPyBjaHVuay5nZXRFeHBh bmRlZExpbmVSb3coY2h1bmsuc3RhcnRMaW5lICsgY2h1bmsubGluZXNDb3VudCAtIDEpIDogY2h1 bmsuZWxlbWVudDsKICAgICAgICAgICAgIGZpcnN0TGluZVJvdyA9IGZpcnN0TGluZVJvdy5uZXh0 U2libGluZzsKICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBmaXJzdExpbmVSb3cgPSB0aGlz LmVsZW1lbnQuZmlyc3RDaGlsZDsKKyAgICAgICAgICAgIGZpcnN0TGluZVJvdyA9IHRoaXMuX2Nv bnRhaW5lci5maXJzdENoaWxkOwogCiAgICAgICAgIHZhciBsaW5lcyA9IFtdOwogICAgICAgICBm b3IgKHZhciBsaW5lUm93ID0gZmlyc3RMaW5lUm93OyBsaW5lUm93OyBsaW5lUm93ID0gbGluZVJv dy5uZXh0U2libGluZykgewpAQCAtMTMwOSw3ICsxMzE5LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRF ZGl0b3JNYWluUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgZmlyc3RMaW5lUm93ID0g Y2h1bmsuZXhwYW5kZWQgPyBjaHVuay5nZXRFeHBhbmRlZExpbmVSb3coY2h1bmsuc3RhcnRMaW5l ICsgY2h1bmsubGluZXNDb3VudCAtIDEpIDogY2h1bmsuZWxlbWVudDsKICAgICAgICAgICAgIGZp cnN0TGluZVJvdyA9IGZpcnN0TGluZVJvdy5uZXh0U2libGluZzsKICAgICAgICAgfSBlbHNlCi0g ICAgICAgICAgICBmaXJzdExpbmVSb3cgPSB0aGlzLmVsZW1lbnQuZmlyc3RDaGlsZDsKKyAgICAg ICAgICAgIGZpcnN0TGluZVJvdyA9IHRoaXMuX2NvbnRhaW5lci5maXJzdENoaWxkOwogCiAgICAg ICAgIC8vIE1vc3QgZnJlcXVlbnQgY2FzZTogYSBjaHVuayByZW1haW5lZCB0aGUgc2FtZS4KICAg ICAgICAgZm9yICh2YXIgY2h1bmtOdW1iZXIgPSBmaXJzdENodW5rTnVtYmVyOyBjaHVua051bWJl ciA8PSBsYXN0Q2h1bmtOdW1iZXI7ICsrY2h1bmtOdW1iZXIpIHsKQEAgLTEzNTIsMTQgKzEzNjIs MTQgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlID0gewogICAg ICAgICB3aGlsZSAoZmlyc3RMaW5lUm93ICYmIGZpcnN0TGluZVJvdyAhPT0gZmlyc3RVbm1vZGlm aWVkTGluZVJvdykgewogICAgICAgICAgICAgdmFyIGxpbmVSb3cgPSBmaXJzdExpbmVSb3c7CiAg ICAgICAgICAgICBmaXJzdExpbmVSb3cgPSBmaXJzdExpbmVSb3cubmV4dFNpYmxpbmc7Ci0gICAg ICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGQobGluZVJvdyk7CisgICAgICAgICAgICB0 aGlzLl9jb250YWluZXIucmVtb3ZlQ2hpbGQobGluZVJvdyk7CiAgICAgICAgIH0KIAogICAgICAg ICAvLyBSZXBsYWNlIG9sZCBjaHVua3Mgd2l0aCB0aGUgbmV3IG9uZXMuCiAgICAgICAgIGZvciAo dmFyIGNodW5rTnVtYmVyID0gZmlyc3RDaHVua051bWJlcjsgbGluZXNDb3VudCA+IDA7ICsrY2h1 bmtOdW1iZXIpIHsKICAgICAgICAgICAgIHZhciBjaHVua0xpbmVzQ291bnQgPSBNYXRoLm1pbih0 aGlzLl9kZWZhdWx0Q2h1bmtTaXplLCBsaW5lc0NvdW50KTsKICAgICAgICAgICAgIHZhciBuZXdD aHVuayA9IHRoaXMuX2NyZWF0ZU5ld0NodW5rKHN0YXJ0TGluZSwgc3RhcnRMaW5lICsgY2h1bmtM aW5lc0NvdW50KTsKLSAgICAgICAgICAgIHRoaXMuZWxlbWVudC5pbnNlcnRCZWZvcmUobmV3Q2h1 bmsuZWxlbWVudCwgZmlyc3RVbm1vZGlmaWVkTGluZVJvdyk7CisgICAgICAgICAgICB0aGlzLl9j b250YWluZXIuaW5zZXJ0QmVmb3JlKG5ld0NodW5rLmVsZW1lbnQsIGZpcnN0VW5tb2RpZmllZExp bmVSb3cpOwogCiAgICAgICAgICAgICBpZiAoY2h1bmtOdW1iZXIgPD0gbGFzdENodW5rTnVtYmVy KQogICAgICAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3NbY2h1bmtOdW1iZXJdID0gbmV3Q2h1 bms7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRW aWV3ZXIuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90ZXh0Vmlld2Vy LmNzcwppbmRleCBmNmFhNjVlYWFkMDZmZDdhOThmOGRiMTBiMTQzNjQ5NWIzZWQ5MDM0Li5lNTg2 YTFlNGRlY2Y1OTZhOThjMDU0MzJmN2UwMTcwOGEwMzI3NWU4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3NzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGV4dFZpZXdlci5jc3MKQEAgLTE3LDYgKzE3LDE1 IEBACiAgICAgLXdlYmtpdC11c2VyLXNlbGVjdDogbm9uZTsKIH0KIAorLmlubmVyLWNvbnRhaW5l ciB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogMDsKKyAgICBsZWZ0OiAwOwor ICAgIHJpZ2h0OiBhdXRvOworICAgIGJvdHRvbTogYXV0bzsKKyAgICBtaW4td2lkdGg6IDEwMCU7 Cit9CisKIC50ZXh0LWVkaXRvci1jb250ZW50cyB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwog ICAgIHRvcDogMDsK 84405 2011-03-02 05:15:32 -0800 2011-03-02 05:46:17 -0800 Patch bug-54675-20110302161530.patch text/plain 13631 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogNzk5OTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4NDAxYmMzMzNjNGNhMmJm ZTRiMmIxMThlMGQ2YWQ1YzA1MWM2MzkxLi5lMzdkZmU0MDVmNjJhYzJlYmViOGM4ZjhlYzFiNjJj ZWNjYTg0MDNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDMtMDIgIEFuZHJl eSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGhpZ2hsaWdodGVkIGxpbmUg ZG9lcyBub3Qgc3BhbiBob3Jpem9uYWxseSBpbiBzY3JpcHRzIHBhbmVsIHdoaWxlIGRlYnVnZ2lu Zy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0Njc1 CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUuX3N5bmNTY3JvbGwpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlLl9idWlsZENo dW5rcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90 b3R5cGUubWFrZUxpbmVBQ2h1bmspOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JH dXR0ZXJQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBhbmVs LnByb3RvdHlwZS5fZXhwYW5kQ2h1bmtzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yR3V0dGVyUGFuZWwucHJvdG90eXBlLnRleHRDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpblBhbmVsLnByb3RvdHlwZS5zZXQgcmVhZE9ubHkpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl9nZXRTZWxlY3Rpb24pOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl9zZWxlY3Rpb25U b1Bvc2l0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnBy b3RvdHlwZS5faGFuZGxlRE9NU3VidHJlZU1vZGlmaWVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5fYXBwbHlEb21VcGRhdGVzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5fdXBkYXRlQ2h1 bmtzRm9yUmFuZ2VzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIu Y3NzOgorICAgICAgICAoLmlubmVyLWNvbnRhaW5lcik6CisKIDIwMTEtMDMtMDEgIFN0ZXZlIEJs b2NrICA8c3RldmVibG9ja0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVt eSBPcmxvdy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv VGV4dFZpZXdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZp ZXdlci5qcwppbmRleCAwYzc4ZTU4YjZmZmRiZjRiMjBjZjhjZGE3Y2IwODFlZDcyYWExMjI0Li45 OGNkMGUxOTk5NTEyMjRiMGU0ZDA5MDMwMWU4ZGJkNWEyODkxNjBhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCkBAIC0yMDQsOSArMjA0 LDkgQEAgV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlID0gewogCiAgICAgICAgICAg ICAvLyBIYW5kbGUgaG9yaXpvbnRhbCBzY3JvbGwgYmFyIGF0IHRoZSBib3R0b20gb2YgdGhlIG1h aW4gcGFuZWwuCiAgICAgICAgICAgICBpZiAoZ3V0dGVyRWxlbWVudC5vZmZzZXRIZWlnaHQgPiBt YWluRWxlbWVudC5jbGllbnRIZWlnaHQpCi0gICAgICAgICAgICAgICAgZ3V0dGVyRWxlbWVudC5z dHlsZS5zZXRQcm9wZXJ0eSgicGFkZGluZy1ib3R0b20iLCAoZ3V0dGVyRWxlbWVudC5vZmZzZXRI ZWlnaHQgLSBtYWluRWxlbWVudC5jbGllbnRIZWlnaHQpICsgInB4Iik7CisgICAgICAgICAgICAg ICAgdGhpcy5fZ3V0dGVyUGFuZWwuX2NvbnRhaW5lci5zdHlsZS5zZXRQcm9wZXJ0eSgicGFkZGlu Zy1ib3R0b20iLCAoZ3V0dGVyRWxlbWVudC5vZmZzZXRIZWlnaHQgLSBtYWluRWxlbWVudC5jbGll bnRIZWlnaHQpICsgInB4Iik7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgZ3V0 dGVyRWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgicGFkZGluZy1ib3R0b20iKTsKKyAgICAg ICAgICAgICAgICB0aGlzLl9ndXR0ZXJQYW5lbC5fY29udGFpbmVyLnN0eWxlLnJlbW92ZVByb3Bl cnR5KCJwYWRkaW5nLWJvdHRvbSIpOwogCiAgICAgICAgICAgICBndXR0ZXJFbGVtZW50LnNjcm9s bFRvcCA9IG1haW5FbGVtZW50LnNjcm9sbFRvcDsKICAgICAgICAgfS5iaW5kKHRoaXMpLCAwKTsK QEAgLTI3OCwxMyArMjc4LDEzIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVs LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMuYmVnaW5Eb21VcGRhdGVzKCk7CiAK LSAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CisgICAgICAgIHRoaXMuX2Nv bnRhaW5lci5yZW1vdmVDaGlsZHJlbigpOwogCiAgICAgICAgIHRoaXMuX3RleHRDaHVua3MgPSBb XTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl90ZXh0TW9kZWwubGluZXNDb3Vu dDsgaSArPSB0aGlzLl9kZWZhdWx0Q2h1bmtTaXplKSB7CiAgICAgICAgICAgICB2YXIgY2h1bmsg PSB0aGlzLl9jcmVhdGVOZXdDaHVuayhpLCBpICsgdGhpcy5fZGVmYXVsdENodW5rU2l6ZSk7CiAg ICAgICAgICAgICB0aGlzLl90ZXh0Q2h1bmtzLnB1c2goY2h1bmspOwotICAgICAgICAgICAgdGhp cy5lbGVtZW50LmFwcGVuZENoaWxkKGNodW5rLmVsZW1lbnQpOworICAgICAgICAgICAgdGhpcy5f Y29udGFpbmVyLmFwcGVuZENoaWxkKGNodW5rLmVsZW1lbnQpOwogICAgICAgICB9CiAKICAgICAg ICAgdGhpcy5fcmVwYWludEFsbCgpOwpAQCAtMzEzLDI0ICszMTMsMjQgQEAgV2ViSW5zcGVjdG9y LlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAobGluZU51 bWJlciA+IG9sZENodW5rLnN0YXJ0TGluZSkgewogICAgICAgICAgICAgdmFyIHByZWZpeENodW5r ID0gdGhpcy5fY3JlYXRlTmV3Q2h1bmsob2xkQ2h1bmsuc3RhcnRMaW5lLCBsaW5lTnVtYmVyKTsK ICAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3Muc3BsaWNlKGluc2VydEluZGV4KyssIDAsIHBy ZWZpeENodW5rKTsKLSAgICAgICAgICAgIHRoaXMuZWxlbWVudC5pbnNlcnRCZWZvcmUocHJlZml4 Q2h1bmsuZWxlbWVudCwgb2xkQ2h1bmsuZWxlbWVudCk7CisgICAgICAgICAgICB0aGlzLl9jb250 YWluZXIuaW5zZXJ0QmVmb3JlKHByZWZpeENodW5rLmVsZW1lbnQsIG9sZENodW5rLmVsZW1lbnQp OwogICAgICAgICB9CiAKICAgICAgICAgLy8gTGluZSBjaHVuay4KICAgICAgICAgdmFyIGxpbmVD aHVuayA9IHRoaXMuX2NyZWF0ZU5ld0NodW5rKGxpbmVOdW1iZXIsIGxpbmVOdW1iZXIgKyAxKTsK ICAgICAgICAgdGhpcy5fdGV4dENodW5rcy5zcGxpY2UoaW5zZXJ0SW5kZXgrKywgMCwgbGluZUNo dW5rKTsKLSAgICAgICAgdGhpcy5lbGVtZW50Lmluc2VydEJlZm9yZShsaW5lQ2h1bmsuZWxlbWVu dCwgb2xkQ2h1bmsuZWxlbWVudCk7CisgICAgICAgIHRoaXMuX2NvbnRhaW5lci5pbnNlcnRCZWZv cmUobGluZUNodW5rLmVsZW1lbnQsIG9sZENodW5rLmVsZW1lbnQpOwogCiAgICAgICAgIC8vIFN1 ZmZpeCBjaHVuay4KICAgICAgICAgaWYgKG9sZENodW5rLnN0YXJ0TGluZSArIG9sZENodW5rLmxp bmVzQ291bnQgPiBsaW5lTnVtYmVyICsgMSkgewogICAgICAgICAgICAgdmFyIHN1ZmZpeENodW5r ID0gdGhpcy5fY3JlYXRlTmV3Q2h1bmsobGluZU51bWJlciArIDEsIG9sZENodW5rLnN0YXJ0TGlu ZSArIG9sZENodW5rLmxpbmVzQ291bnQpOwogICAgICAgICAgICAgdGhpcy5fdGV4dENodW5rcy5z cGxpY2UoaW5zZXJ0SW5kZXgsIDAsIHN1ZmZpeENodW5rKTsKLSAgICAgICAgICAgIHRoaXMuZWxl bWVudC5pbnNlcnRCZWZvcmUoc3VmZml4Q2h1bmsuZWxlbWVudCwgb2xkQ2h1bmsuZWxlbWVudCk7 CisgICAgICAgICAgICB0aGlzLl9jb250YWluZXIuaW5zZXJ0QmVmb3JlKHN1ZmZpeENodW5rLmVs ZW1lbnQsIG9sZENodW5rLmVsZW1lbnQpOwogICAgICAgICB9CiAKICAgICAgICAgLy8gUmVtb3Zl IGVuY2xvc2luZyBjaHVuay4KICAgICAgICAgdGhpcy5fdGV4dENodW5rcy5zcGxpY2UoY2h1bmtO dW1iZXIsIDEpOwotICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGQob2xkQ2h1bmsuZWxl bWVudCk7CisgICAgICAgIHRoaXMuX2NvbnRhaW5lci5yZW1vdmVDaGlsZChvbGRDaHVuay5lbGVt ZW50KTsKIAogICAgICAgICBpZiAod2FzRXhwYW5kZWQpIHsKICAgICAgICAgICAgIGlmIChwcmVm aXhDaHVuaykKQEAgLTQ1Niw3ICs0NTYsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5r ZWRQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHRvdGFsOwog ICAgIH0sCi0gICAgCisKICAgICByZXNpemU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRo aXMuX3JlcGFpbnRBbGwoKTsKQEAgLTQ3Miw2ICs0NzIsMTAgQEAgV2ViSW5zcGVjdG9yLlRleHRF ZGl0b3JHdXR0ZXJQYW5lbCA9IGZ1bmN0aW9uKHRleHRNb2RlbCwgc3luY0RlY29yYXRpb25zRm9y TGluZUwKICAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsK ICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInRleHQtZWRpdG9yLWxpbmVzIjsKIAorICAg IHRoaXMuX2NvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRo aXMuX2NvbnRhaW5lci5jbGFzc05hbWUgPSAiaW5uZXItY29udGFpbmVyIjsKKyAgICB0aGlzLmVs ZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY29udGFpbmVyKTsKKwogICAgIHRoaXMuZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9zY3JvbGwuYmluZCh0aGlzKSwgZmFsc2Up OwogCiAgICAgdGhpcy5mcmVlQ2FjaGVkRWxlbWVudHMoKTsKQEAgLTQ5Myw2ICs0OTcsNyBAQCBX ZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsLnByb3RvdHlwZSA9IHsKICAgICB7CiAg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fdGV4dENodW5rcy5sZW5ndGg7ICsraSkK ICAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3NbaV0uZXhwYW5kZWQgPSAoZnJvbUluZGV4IDw9 IGkgJiYgaSA8IHRvSW5kZXgpOworICAgICAgICB0aGlzLmVsZW1lbnQuc3R5bGUuc2V0UHJvcGVy dHkoIndpZHRoIiwgdGhpcy5fY29udGFpbmVyLm9mZnNldFdpZHRoICsgInB4Iik7CiAgICAgfSwK IAogICAgIHRleHRDaGFuZ2VkOiBmdW5jdGlvbihvbGRSYW5nZSwgbmV3UmFuZ2UpCkBAIC01MTAs NyArNTE1LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICAgICAgaWYgKGNodW5rLnN0YXJ0TGluZSArIGNodW5rLmxpbmVzQ291 bnQgPD0gdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQpCiAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICAgICAgICAgIGNodW5rLmV4cGFuZGVkID0gZmFsc2U7Ci0gICAgICAgICAg ICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZUNoaWxkKGNodW5rLmVsZW1lbnQpOworICAgICAgICAg ICAgICAgIHRoaXMuX2NvbnRhaW5lci5yZW1vdmVDaGlsZChjaHVuay5lbGVtZW50KTsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIHRoaXMuX3RleHRDaHVua3MubGVuZ3RoID0gY2h1bmtOdW1i ZXIgKyAxOwogCkBAIC01MjMsNyArNTI4LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0 ZXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gdG90YWxMaW5l czsgaSA8IHRoaXMuX3RleHRNb2RlbC5saW5lc0NvdW50OyBpICs9IHRoaXMuX2RlZmF1bHRDaHVu a1NpemUpIHsKICAgICAgICAgICAgICAgICB2YXIgY2h1bmsgPSB0aGlzLl9jcmVhdGVOZXdDaHVu ayhpLCBpICsgdGhpcy5fZGVmYXVsdENodW5rU2l6ZSk7CiAgICAgICAgICAgICAgICAgdGhpcy5f dGV4dENodW5rcy5wdXNoKGNodW5rKTsKLSAgICAgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYXBw ZW5kQ2hpbGQoY2h1bmsuZWxlbWVudCk7CisgICAgICAgICAgICAgICAgdGhpcy5fY29udGFpbmVy LmFwcGVuZENoaWxkKGNodW5rLmVsZW1lbnQpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAg dGhpcy5fcmVwYWludEFsbCgpOwogICAgICAgICB9IGVsc2UgewpAQCAtNjcyLDIxICs2NzcsMjUg QEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwgPSBmdW5jdGlvbih0ZXh0TW9kZWws IHVybCwgc3luY1Njcm9sbExpc3RlbmVyLAogCiAgICAgdGhpcy5lbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9ICJ0ZXh0 LWVkaXRvci1jb250ZW50cyI7Ci0gICAgdGhpcy5lbGVtZW50LnRhYkluZGV4ID0gMDsKKworICAg IHRoaXMuX2NvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRo aXMuX2NvbnRhaW5lci5jbGFzc05hbWUgPSAiaW5uZXItY29udGFpbmVyIjsKKyAgICB0aGlzLl9j b250YWluZXIudGFiSW5kZXggPSAwOworICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz Ll9jb250YWluZXIpOwogCiAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9s bCIsIHRoaXMuX3Njcm9sbC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAgICAvLyBGSVhNRTogUmVt b3ZlIG9sZCBsaXZlIGVkaXRpbmcgZnVuY3Rpb25hbGl0eSBhbmQgUHJlZmVyZW5jZXMuc291cmNl RWRpdG9yRW5hYmxlZCBmbGFnLgogICAgIGlmICghUHJlZmVyZW5jZXMuc291cmNlRWRpdG9yRW5h YmxlZCkKLSAgICAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0 aGlzLl9oYW5kbGVLZXlEb3duLmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICAgICAgdGhpcy5fY29u dGFpbmVyLmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLl9oYW5kbGVLZXlEb3duLmJp bmQodGhpcyksIGZhbHNlKTsKIAogICAgIHZhciBoYW5kbGVET01VcGRhdGVzID0gdGhpcy5faGFu ZGxlRE9NVXBkYXRlcy5iaW5kKHRoaXMpOwotICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3Rl bmVyKCJET01DaGFyYWN0ZXJEYXRhTW9kaWZpZWQiLCBoYW5kbGVET01VcGRhdGVzLCBmYWxzZSk7 Ci0gICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIkRPTU5vZGVJbnNlcnRlZCIsIGhh bmRsZURPTVVwZGF0ZXMsIGZhbHNlKTsKLSAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigiRE9NTm9kZVJlbW92ZWQiLCBoYW5kbGVET01VcGRhdGVzLCBmYWxzZSk7CisgICAgdGhpcy5f Y29udGFpbmVyLmFkZEV2ZW50TGlzdGVuZXIoIkRPTUNoYXJhY3RlckRhdGFNb2RpZmllZCIsIGhh bmRsZURPTVVwZGF0ZXMsIGZhbHNlKTsKKyAgICB0aGlzLl9jb250YWluZXIuYWRkRXZlbnRMaXN0 ZW5lcigiRE9NTm9kZUluc2VydGVkIiwgaGFuZGxlRE9NVXBkYXRlcywgZmFsc2UpOworICAgIHRo aXMuX2NvbnRhaW5lci5hZGRFdmVudExpc3RlbmVyKCJET01Ob2RlUmVtb3ZlZCIsIGhhbmRsZURP TVVwZGF0ZXMsIGZhbHNlKTsKICAgICAvLyBGb3Igc29tZSByZWFzb25zLCBpbiBhIGZldyBjb3Ju ZXIgY2FzZXMgdGhlIGV2ZW50cyBhYm92ZSBhcmUgbm90IGFibGUgdG8gY2F0Y2ggdGhlIGVkaXRp bmdzLgogICAgIC8vIFRvIHdvcmthcm91bmQgdGhhdCB3ZSBhbHNvIGxpc3RlbiB0byBhIG1vcmUg Z2VuZXJhbCBldmVudCBhcyBhIGJhY2t1cC4KLSAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigiRE9NU3VidHJlZU1vZGlmaWVkIiwgdGhpcy5faGFuZGxlRE9NU3VidHJlZU1vZGlmaWVk LmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICB0aGlzLl9jb250YWluZXIuYWRkRXZlbnRMaXN0ZW5l cigiRE9NU3VidHJlZU1vZGlmaWVkIiwgdGhpcy5faGFuZGxlRE9NU3VidHJlZU1vZGlmaWVkLmJp bmQodGhpcyksIGZhbHNlKTsKIAogICAgIHRoaXMuZnJlZUNhY2hlZEVsZW1lbnRzKCk7CiAgICAg dGhpcy5fYnVpbGRDaHVua3MoKTsKQEAgLTcwNyw5ICs3MTYsOSBAQCBXZWJJbnNwZWN0b3IuVGV4 dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuYmVnaW5Eb21VcGRh dGVzKCk7CiAgICAgICAgIHRoaXMuX3JlYWRPbmx5ID0gcmVhZE9ubHk7CiAgICAgICAgIGlmICh0 aGlzLl9yZWFkT25seSkKLSAgICAgICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNz KCJ0ZXh0LWVkaXRvci1lZGl0YWJsZSIpOworICAgICAgICAgICAgdGhpcy5fY29udGFpbmVyLnJl bW92ZVN0eWxlQ2xhc3MoInRleHQtZWRpdG9yLWVkaXRhYmxlIik7CiAgICAgICAgIGVsc2UKLSAg ICAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJ0ZXh0LWVkaXRvci1lZGl0YWJs ZSIpOworICAgICAgICAgICAgdGhpcy5fY29udGFpbmVyLmFkZFN0eWxlQ2xhc3MoInRleHQtZWRp dG9yLWVkaXRhYmxlIik7CiAgICAgICAgIHRoaXMuZW5kRG9tVXBkYXRlcygpOwogICAgIH0sCiAK QEAgLTk3Miw3ICs5ODEsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm4gbnVsbDsKICAgICAgICAgdmFyIHNlbGVjdGlv blJhbmdlID0gc2VsZWN0aW9uLmdldFJhbmdlQXQoMCk7CiAgICAgICAgIC8vIFNlbGVjdGlvbiBt YXkgYmUgb3V0c2lkZSBvZiB0aGUgdmlld2VyLgotICAgICAgICBpZiAoIXRoaXMuZWxlbWVudC5p c0FuY2VzdG9yKHNlbGVjdGlvblJhbmdlLnN0YXJ0Q29udGFpbmVyKSB8fCAhdGhpcy5lbGVtZW50 LmlzQW5jZXN0b3Ioc2VsZWN0aW9uUmFuZ2UuZW5kQ29udGFpbmVyKSkKKyAgICAgICAgaWYgKCF0 aGlzLl9jb250YWluZXIuaXNBbmNlc3RvcihzZWxlY3Rpb25SYW5nZS5zdGFydENvbnRhaW5lcikg fHwgIXRoaXMuX2NvbnRhaW5lci5pc0FuY2VzdG9yKHNlbGVjdGlvblJhbmdlLmVuZENvbnRhaW5l cikpCiAgICAgICAgICAgICByZXR1cm4gbnVsbDsKICAgICAgICAgdmFyIHN0YXJ0ID0gdGhpcy5f c2VsZWN0aW9uVG9Qb3NpdGlvbihzZWxlY3Rpb25SYW5nZS5zdGFydENvbnRhaW5lciwgc2VsZWN0 aW9uUmFuZ2Uuc3RhcnRPZmZzZXQpOwogICAgICAgICB2YXIgZW5kID0gc2VsZWN0aW9uUmFuZ2Uu Y29sbGFwc2VkID8gc3RhcnQgOiB0aGlzLl9zZWxlY3Rpb25Ub1Bvc2l0aW9uKHNlbGVjdGlvblJh bmdlLmVuZENvbnRhaW5lciwgc2VsZWN0aW9uUmFuZ2UuZW5kT2Zmc2V0KTsKQEAgLTk5Myw5ICsx MDAyLDkgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlID0gewog CiAgICAgX3NlbGVjdGlvblRvUG9zaXRpb246IGZ1bmN0aW9uKGNvbnRhaW5lciwgb2Zmc2V0KQog ICAgIHsKLSAgICAgICAgaWYgKGNvbnRhaW5lciA9PT0gdGhpcy5lbGVtZW50ICYmIG9mZnNldCA9 PT0gMCkKKyAgICAgICAgaWYgKGNvbnRhaW5lciA9PT0gdGhpcy5fY29udGFpbmVyICYmIG9mZnNl dCA9PT0gMCkKICAgICAgICAgICAgIHJldHVybiB7IGxpbmU6IDAsIGNvbHVtbjogMCB9OwotICAg ICAgICBpZiAoY29udGFpbmVyID09PSB0aGlzLmVsZW1lbnQgJiYgb2Zmc2V0ID09PSAxKQorICAg ICAgICBpZiAoY29udGFpbmVyID09PSB0aGlzLl9jb250YWluZXIgJiYgb2Zmc2V0ID09PSAxKQog ICAgICAgICAgICAgcmV0dXJuIHsgbGluZTogdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQgLSAx LCBjb2x1bW46IHRoaXMuX3RleHRNb2RlbC5saW5lTGVuZ3RoKHRoaXMuX3RleHRNb2RlbC5saW5l c0NvdW50IC0gMSkgfTsKIAogICAgICAgICB2YXIgbGluZVJvdyA9IGNvbnRhaW5lci5lbmNsb3Np bmdOb2RlT3JTZWxmV2l0aE5vZGVOYW1lKCJESVYiKTsKQEAgLTExMTEsNyArMTEyMCw3IEBAIFdl Ykluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IHJldHVybjsKIAogICAgICAgICB2YXIgdGFyZ2V0ID0gZS50YXJnZXQ7Ci0gICAgICAgIGlmICh0 YXJnZXQgPT09IHRoaXMuZWxlbWVudCkKKyAgICAgICAgaWYgKHRhcmdldCA9PT0gdGhpcy5fY29u dGFpbmVyKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHZhciBsaW5lUm93ID0gdGFy Z2V0LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoQ2xhc3MoIndlYmtpdC1saW5lLWNvbnRlbnQiKTsK QEAgLTExNTgsNyArMTE2Nyw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnBy b3RvdHlwZSA9IHsKIAogICAgIF9oYW5kbGVET01TdWJ0cmVlTW9kaWZpZWQ6IGZ1bmN0aW9uKGUp CiAgICAgewotICAgICAgICBpZiAodGhpcy5fZG9tVXBkYXRlQ29hbGVzY2luZ0xldmVsIHx8IHRo aXMuX3JlYWRPbmx5IHx8IGUudGFyZ2V0ICE9PSB0aGlzLmVsZW1lbnQpCisgICAgICAgIGlmICh0 aGlzLl9kb21VcGRhdGVDb2FsZXNjaW5nTGV2ZWwgfHwgdGhpcy5fcmVhZE9ubHkgfHwgZS50YXJn ZXQgIT09IHRoaXMuX2NvbnRhaW5lcikKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAv LyBQcm9jZWVkIG9ubHkgd2hlbiBvdGhlciBldmVudHMgZmFpbGVkIHRvIGNhdGNoIHRoZSBET00g dXBkYXRlcywgb3RoZXJ3aXNlIGl0IGlzIG5vdCBuZWNlc3NhcnkuCkBAIC0xMjE3LDcgKzEyMjYs NyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICBmaXJzdExpbmVSb3cgPSBjaHVuay5leHBhbmRlZCA/IGNodW5rLmdldEV4cGFuZGVk TGluZVJvdyhjaHVuay5zdGFydExpbmUgKyBjaHVuay5saW5lc0NvdW50IC0gMSkgOiBjaHVuay5l bGVtZW50OwogICAgICAgICAgICAgZmlyc3RMaW5lUm93ID0gZmlyc3RMaW5lUm93Lm5leHRTaWJs aW5nOwogICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIGZpcnN0TGluZVJvdyA9IHRoaXMuZWxl bWVudC5maXJzdENoaWxkOworICAgICAgICAgICAgZmlyc3RMaW5lUm93ID0gdGhpcy5fY29udGFp bmVyLmZpcnN0Q2hpbGQ7CiAKICAgICAgICAgdmFyIGxpbmVzID0gW107CiAgICAgICAgIGZvciAo dmFyIGxpbmVSb3cgPSBmaXJzdExpbmVSb3c7IGxpbmVSb3c7IGxpbmVSb3cgPSBsaW5lUm93Lm5l eHRTaWJsaW5nKSB7CkBAIC0xMzA5LDcgKzEzMTgsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBmaXJzdExpbmVSb3cgPSBjaHVu ay5leHBhbmRlZCA/IGNodW5rLmdldEV4cGFuZGVkTGluZVJvdyhjaHVuay5zdGFydExpbmUgKyBj aHVuay5saW5lc0NvdW50IC0gMSkgOiBjaHVuay5lbGVtZW50OwogICAgICAgICAgICAgZmlyc3RM aW5lUm93ID0gZmlyc3RMaW5lUm93Lm5leHRTaWJsaW5nOwogICAgICAgICB9IGVsc2UKLSAgICAg ICAgICAgIGZpcnN0TGluZVJvdyA9IHRoaXMuZWxlbWVudC5maXJzdENoaWxkOworICAgICAgICAg ICAgZmlyc3RMaW5lUm93ID0gdGhpcy5fY29udGFpbmVyLmZpcnN0Q2hpbGQ7CiAKICAgICAgICAg Ly8gTW9zdCBmcmVxdWVudCBjYXNlOiBhIGNodW5rIHJlbWFpbmVkIHRoZSBzYW1lLgogICAgICAg ICBmb3IgKHZhciBjaHVua051bWJlciA9IGZpcnN0Q2h1bmtOdW1iZXI7IGNodW5rTnVtYmVyIDw9 IGxhc3RDaHVua051bWJlcjsgKytjaHVua051bWJlcikgewpAQCAtMTM1MiwxNCArMTM2MSwxNCBA QCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg IHdoaWxlIChmaXJzdExpbmVSb3cgJiYgZmlyc3RMaW5lUm93ICE9PSBmaXJzdFVubW9kaWZpZWRM aW5lUm93KSB7CiAgICAgICAgICAgICB2YXIgbGluZVJvdyA9IGZpcnN0TGluZVJvdzsKICAgICAg ICAgICAgIGZpcnN0TGluZVJvdyA9IGZpcnN0TGluZVJvdy5uZXh0U2libGluZzsKLSAgICAgICAg ICAgIHRoaXMuZWxlbWVudC5yZW1vdmVDaGlsZChsaW5lUm93KTsKKyAgICAgICAgICAgIHRoaXMu X2NvbnRhaW5lci5yZW1vdmVDaGlsZChsaW5lUm93KTsKICAgICAgICAgfQogCiAgICAgICAgIC8v IFJlcGxhY2Ugb2xkIGNodW5rcyB3aXRoIHRoZSBuZXcgb25lcy4KICAgICAgICAgZm9yICh2YXIg Y2h1bmtOdW1iZXIgPSBmaXJzdENodW5rTnVtYmVyOyBsaW5lc0NvdW50ID4gMDsgKytjaHVua051 bWJlcikgewogICAgICAgICAgICAgdmFyIGNodW5rTGluZXNDb3VudCA9IE1hdGgubWluKHRoaXMu X2RlZmF1bHRDaHVua1NpemUsIGxpbmVzQ291bnQpOwogICAgICAgICAgICAgdmFyIG5ld0NodW5r ID0gdGhpcy5fY3JlYXRlTmV3Q2h1bmsoc3RhcnRMaW5lLCBzdGFydExpbmUgKyBjaHVua0xpbmVz Q291bnQpOwotICAgICAgICAgICAgdGhpcy5lbGVtZW50Lmluc2VydEJlZm9yZShuZXdDaHVuay5l bGVtZW50LCBmaXJzdFVubW9kaWZpZWRMaW5lUm93KTsKKyAgICAgICAgICAgIHRoaXMuX2NvbnRh aW5lci5pbnNlcnRCZWZvcmUobmV3Q2h1bmsuZWxlbWVudCwgZmlyc3RVbm1vZGlmaWVkTGluZVJv dyk7CiAKICAgICAgICAgICAgIGlmIChjaHVua051bWJlciA8PSBsYXN0Q2h1bmtOdW1iZXIpCiAg ICAgICAgICAgICAgICAgdGhpcy5fdGV4dENodW5rc1tjaHVua051bWJlcl0gPSBuZXdDaHVuazsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGV4dFZpZXdl ci5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3Nz CmluZGV4IGY2YWE2NWVhYWQwNmZkN2E5OGY4ZGIxMGIxNDM2NDk1YjNlZDkwMzQuLmU1ODZhMWU0 ZGVjZjU5NmE5OGMwNTQzMmY3ZTAxNzA4YTAzMjc1ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGV4dFZpZXdlci5jc3MKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC90ZXh0Vmlld2VyLmNzcwpAQCAtMTcsNiArMTcsMTUgQEAK ICAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lOwogfQogCisuaW5uZXItY29udGFpbmVyIHsK KyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgdG9wOiAwOworICAgIGxlZnQ6IDA7CisgICAg cmlnaHQ6IGF1dG87CisgICAgYm90dG9tOiBhdXRvOworICAgIG1pbi13aWR0aDogMTAwJTsKK30K KwogLnRleHQtZWRpdG9yLWNvbnRlbnRzIHsKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CiAgICAg dG9wOiAwOwo=