103059 2012-11-22 05:34:39 -0800 Web Inspector: [REGRESSION] [Styles] Rule disappears if edited selector does not affect selected node 2012-12-04 01:19:19 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 773865 0 apavlov 2012-11-22 05:34:39 -0800 Such rules should get dimmed instead. 778746 1 176660 apavlov 2012-11-28 23:56:28 -0800 Created attachment 176660 Patch 779424 2 176660 pfeldman 2012-11-29 14:14:06 -0800 Comment on attachment 176660 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=176660&action=review Having a dedicated test case for this would be great. > Source/WebCore/inspector/front-end/StylesSidebarPane.js:1317 > + // This gets deleted in this._moveEditorFromSelector(), which is called both on success and failure. _moveEditorFromSelector is called from many other places too. 779931 3 176921 apavlov 2012-11-30 01:29:49 -0800 Created attachment 176921 Patch 781235 4 177210 apavlov 2012-12-03 01:55:57 -0800 Created attachment 177210 Patch 781339 5 177230 apavlov 2012-12-03 04:45:34 -0800 Created attachment 177230 Patch 781342 6 177231 apavlov 2012-12-03 04:50:53 -0800 Created attachment 177231 Patch 782355 7 apavlov 2012-12-04 01:19:19 -0800 Committed r136488: <http://trac.webkit.org/changeset/136488> 176660 2012-11-28 23:56:28 -0800 2012-11-30 01:29:44 -0800 Patch bug-103059-20121129115401.patch text/plain 6553 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjM5OTc5MzVhMDlkMjAz MmNhYTc3ZDIzMzk4MjQwMzQ2NmNiNmJmNS4uYWI4ZTc0NWJlOWEzZGFmNjAzMDM1Y2EzYWU2ZTk2 MWIxMTYxMzUxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTI4ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1JFR1JFU1NJT05dIFtTdHlsZXNdIFJ1bGUgZGlzYXBwZWFycyBpZiBlZGl0ZWQgc2Vs ZWN0b3IgZG9lcyBub3QgYWZmZWN0IHNlbGVjdGVkIG5vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzA1OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGVmZmVjdGl2ZWx5IHR1cm5z IFdlYkluc3BlY3Rvci5jc3NNb2RlbC5zZXRSdWxlU2VsZWN0b3IoKSBpbnRvIGEgX3VzZXJPcGVy YXRpb24KKyAgICAgICAgKGluIHRlcm1zIG9mIFN0eWxlc1NpZGViYXJQYW5lKSwgd2hpY2ggZmlu aXNoZXMgdXBvbiB0aGUgX21vdmVFZGl0b3JGcm9tU2VsZWN0b3IoKSBpbnZvY2F0aW9uLgorCisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS51cGRhdGUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBl Ll9tb3ZlRWRpdG9yRnJvbVNlbGVjdG9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVBy b3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5zdWNjZXNzQ2FsbGJhY2spOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVkaXRpbmdTZWxlY3Rv ckNvbW1pdHRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNT ZWN0aW9uLnByb3RvdHlwZS5lZGl0aW5nU2VsZWN0b3JDb21taXR0ZWQpOgorCiAyMDEyLTExLTI4 ICBNaWtlIFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogQ29uc29sZSBtZXNzYWdlJ3MgYW5jaG9yIGVsZW1lbnQgc2hvdWxkIGJlIHRyaW1tZWQgZm9y IHJlYWRhYmlsaXR5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKaW5kZXggZjcxOTZhMWYyNWVkNjQwZmE2ZjVkNjBj NTVlNjljOTFhOGU1ZGY1MC4uOTY4MmRjOTdlNTRjNjU5OWEwMGUyNzkyODk1NzVmOTIxMGQ1MTRl ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNT aWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0 eWxlc1NpZGViYXJQYW5lLmpzCkBAIC05ODQsNiArOTg0LDggQEAgV2ViSW5zcGVjdG9yLlN0eWxl UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogCiAgICAgdXBkYXRlOiBmdW5jdGlvbihm dWxsKQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMuc3R5bGVSdWxlLnNlbGVjdG9yVGV4dCkKKyAg ICAgICAgICAgIHRoaXMuX3NlbGVjdG9yRWxlbWVudC50ZXh0Q29udGVudCA9IHRoaXMuc3R5bGVS dWxlLnNlbGVjdG9yVGV4dDsKICAgICAgICAgaWYgKGZ1bGwpIHsKICAgICAgICAgICAgIHRoaXMu cHJvcGVydGllc1RyZWVPdXRsaW5lLnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgICAgICAgICB0aGlz LnBvcHVsYXRlZCA9IGZhbHNlOwpAQCAtMTI1NSw2ICsxMjU3LDkgQEAgV2ViSW5zcGVjdG9yLlN0 eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogCiAgICAgX21vdmVFZGl0b3JGcm9t U2VsZWN0b3I6IGZ1bmN0aW9uKG1vdmVEaXJlY3Rpb24pCiAgICAgeworICAgICAgICAvLyBUaGlz IG1ldGhvZCBpcyBhIGNhbGxiYWNrIGZvciBzZWxlY3Rvci1tb2RpZnlpbmcgb3BlcmF0aW9ucy4K KyAgICAgICAgZGVsZXRlIHRoaXMuX3BhcmVudFBhbmUuX3VzZXJPcGVyYXRpb247CisKICAgICAg ICAgdGhpcy5fbWFya1NlbGVjdG9yTWF0Y2hlcygpOwogCiAgICAgICAgIGlmICghbW92ZURpcmVj dGlvbikKQEAgLTEyODksNiArMTI5NCw4IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNT ZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybiB0aGlzLl9tb3ZlRWRpdG9y RnJvbVNlbGVjdG9yKG1vdmVEaXJlY3Rpb24pOwogICAgICAgICB9CiAKKyAgICAgICAgdmFyIHNl bGVjdGVkTm9kZSA9IHRoaXMuX3BhcmVudFBhbmUubm9kZTsKKwogICAgICAgICBmdW5jdGlvbiBz dWNjZXNzQ2FsbGJhY2sobmV3UnVsZSwgZG9lc0FmZmVjdFNlbGVjdGVkTm9kZSkKICAgICAgICAg ewogICAgICAgICAgICAgaWYgKCFkb2VzQWZmZWN0U2VsZWN0ZWROb2RlKSB7CkBAIC0xMzAyLDEy ICsxMzA5LDEzIEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIHRoaXMucnVsZSA9IG5ld1J1bGU7CiAgICAgICAgICAgICB0aGlz LnN0eWxlUnVsZSA9IHsgc2VjdGlvbjogdGhpcywgc3R5bGU6IG5ld1J1bGUuc3R5bGUsIHNlbGVj dG9yVGV4dDogbmV3UnVsZS5zZWxlY3RvclRleHQsIG1lZGlhOiBuZXdSdWxlLm1lZGlhLCBzb3Vy Y2VVUkw6IG5ld1J1bGUuc291cmNlVVJMLCBydWxlOiBuZXdSdWxlIH07CiAKLSAgICAgICAgICAg IHRoaXMuX3BhcmVudFBhbmUudXBkYXRlKCk7CisgICAgICAgICAgICB0aGlzLl9wYXJlbnRQYW5l LnVwZGF0ZShzZWxlY3RlZE5vZGUpOwogCiAgICAgICAgICAgICB0aGlzLl9tb3ZlRWRpdG9yRnJv bVNlbGVjdG9yKG1vdmVEaXJlY3Rpb24pOwogICAgICAgICB9CiAKLSAgICAgICAgdmFyIHNlbGVj dGVkTm9kZSA9IHRoaXMuX3BhcmVudFBhbmUubm9kZTsKKyAgICAgICAgLy8gVGhpcyBnZXRzIGRl bGV0ZWQgaW4gdGhpcy5fbW92ZUVkaXRvckZyb21TZWxlY3RvcigpLCB3aGljaCBpcyBjYWxsZWQg Ym90aCBvbiBzdWNjZXNzIGFuZCBmYWlsdXJlLgorICAgICAgICB0aGlzLl9wYXJlbnRQYW5lLl91 c2VyT3BlcmF0aW9uID0gdHJ1ZTsKICAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVsLnNldFJ1 bGVTZWxlY3Rvcih0aGlzLnJ1bGUuaWQsIHNlbGVjdGVkTm9kZSA/IHNlbGVjdGVkTm9kZS5pZCA6 IDAsIG5ld0NvbnRlbnQsIHN1Y2Nlc3NDYWxsYmFjay5iaW5kKHRoaXMpLCB0aGlzLl9tb3ZlRWRp dG9yRnJvbVNlbGVjdG9yLmJpbmQodGhpcywgbW92ZURpcmVjdGlvbikpOwogICAgIH0sCiAKQEAg LTE0OTIsNiArMTUwMCw4IEBAIFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rp b24ucHJvdG90eXBlID0gewogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3BhcmVudFBhbmUuX3Vz ZXJPcGVyYXRpb247CiAgICAgICAgIH0KIAorICAgICAgICBpZiAobmV3Q29udGVudCkKKyAgICAg ICAgICAgIG5ld0NvbnRlbnQgPSBuZXdDb250ZW50LnRyaW0oKTsKICAgICAgICAgdGhpcy5fcGFy ZW50UGFuZS5fdXNlck9wZXJhdGlvbiA9IHRydWU7CiAgICAgICAgIFdlYkluc3BlY3Rvci5jc3NN b2RlbC5hZGRSdWxlKHRoaXMucGFuZS5ub2RlLmlkLCBuZXdDb250ZW50LCBzdWNjZXNzQ2FsbGJh Y2suYmluZCh0aGlzKSwgdGhpcy5lZGl0aW5nU2VsZWN0b3JDYW5jZWxsZWQuYmluZCh0aGlzKSk7 CiAgICAgfSwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwppbmRleCAzNzQwODQwM2U3ZmE0MzhlZWVmOWEwYTJjZGM4ZmViYThmNzdlZTQ2 Li4wMmYzZTA4MDVmMDc3MTUyMTFlZTY3ZmI1MzA0ZDllZWYzNGNiOWE0IDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTUgQEAKKzIwMTItMTEtMjggIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVt Lm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBbUkVHUkVTU0lPTl0gW1N0eWxlc10gUnVs ZSBkaXNhcHBlYXJzIGlmIGVkaXRlZCBzZWxlY3RvciBkb2VzIG5vdCBhZmZlY3Qgc2VsZWN0ZWQg bm9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAz MDU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBo dHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0LmpzOgorICAgICAgICAoaW5pdGlhbGl6 ZV9FbGVtZW50VGVzdC5JbnNwZWN0b3JUZXN0LmR1bXBTZWxlY3RlZEVsZW1lbnRTdHlsZXMpOgor ICAgICAgICAgIEFkZCBkdW1waW5nIG9mIHRoZSBbbm8tYWZmZWN0XSBmbGFnIGZvciBydWxlcyBu b3QgYWZmZWN0aW5nIHRoZSBjdXJyZW50bHkgc2VsZWN0ZWQgZWxlbWVudC4KKyAgICAgICAgKiBp bnNwZWN0b3Ivc3R5bGVzL2NvbW1pdC1zZWxlY3Rvci1leHBlY3RlZC50eHQ6IFJlYmFzZWxpbmUu CisKIDIwMTItMTEtMjggIE1pa2UgV2VzdCAgPG1rd3N0QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBDb25zb2xlIG1lc3NhZ2UncyBhbmNob3IgZWxlbWVudCBzaG91bGQg YmUgdHJpbW1lZCBmb3IgcmVhZGFiaWxpdHkuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdC5qcwppbmRleCAxMTdjNGVjM2FjNzRhNzdiMTcxMDA5 MzdmZjRmNTA0ZjdkMTFhOGU2Li4xNDcwZTdmY2I0YzZhZTA3Yzk3MDJhZTk2NWVjNzQ5NDQzMTJi NTdhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVtZW50 cy10ZXN0LmpzCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRz LXRlc3QuanMKQEAgLTE1Myw3ICsxNTMsNyBAQCBJbnNwZWN0b3JUZXN0LmR1bXBTZWxlY3RlZEVs ZW1lbnRTdHlsZXMgPSBmdW5jdGlvbihleGNsdWRlQ29tcHV0ZWQsIGV4Y2x1ZGVNYXRjaAogICAg ICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgaWYgKHNlY3Rpb24uZWxlbWVudC5w cmV2aW91c1NpYmxpbmcgJiYgc2VjdGlvbi5lbGVtZW50LnByZXZpb3VzU2libGluZy5jbGFzc05h bWUgPT09ICJzaWRlYmFyLXNlcGFyYXRvciIpCiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hZGRSZXN1bHQoIj09PT09PT09ICIgKyBzZWN0aW9uLmVsZW1lbnQucHJldmlvdXNTaWJsaW5n LnRleHRDb250ZW50ICsgIiA9PT09PT09PSIpOwotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5h ZGRSZXN1bHQoc2VjdGlvbi5leHBhbmRlZCA/ICJbZXhwYW5kZWRdICIgOiAiW2NvbGxhcHNlZF0g Iik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgoc2VjdGlvbi5leHBhbmRl ZCA/ICJbZXhwYW5kZWRdICIgOiAiW2NvbGxhcHNlZF0gIikgKyAoc2VjdGlvbi5ub0FmZmVjdCA/ ICJbbm8tYWZmZWN0XSAiIDogIiIpKTsKICAgICAgICAgICAgIHZhciBjaGFpbkVudHJpZXMgPSBz ZWN0aW9uLnRpdGxlRWxlbWVudC5jaGlsZHJlbjsKICAgICAgICAgICAgIGZvciAodmFyIGogPSAw OyBqIDwgY2hhaW5FbnRyaWVzLmxlbmd0aDsgKytqKSB7CiAgICAgICAgICAgICAgICAgdmFyIGNo YWluRW50cnkgPSBjaGFpbkVudHJpZXNbal07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3Ivc3R5bGVzL2NvbW1pdC1zZWxlY3Rvci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3Ivc3R5bGVzL2NvbW1pdC1zZWxlY3Rvci1leHBlY3RlZC50eHQKaW5kZXggMzkxNjUy MmY4NmYyZTIzZjY2Y2RmYjFlMGQwMmIzNzI3ZTBhNDkxZC4uMWFlNjI0NjExYzk3MTRkNWNlNGRm ODlmNTUxNWVlOTFjNDdlYjM4ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0 eWxlcy9jb21taXQtc2VsZWN0b3ItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9zdHlsZXMvY29tbWl0LXNlbGVjdG9yLWV4cGVjdGVkLnR4dApAQCAtMzcsNiArMzcsMTAg QEAgZWxlbWVudC5zdHlsZSAgeyAoKQogY29sb3I6IHJlZDsKIAogPT09PT09PT0gTWF0Y2hlZCBD U1MgUnVsZXMgPT09PT09PT0KK1tleHBhbmRlZF0gW25vLWFmZmVjdF0gCisjaW5zcGVjdGVkY2hh bmdlZCAgeyAoY29tbWl0LXNlbGVjdG9yLmh0bWw6NCkKK2NvbG9yOiBncmVlbjsKKwogW2V4cGFu ZGVkXSAKIGRpdiAgeyAodXNlciBhZ2VudCBzdHlsZXNoZWV0KQogZGlzcGxheTogYmxvY2s7Cg== 176921 2012-11-30 01:29:49 -0800 2012-12-03 01:55:52 -0800 Patch bug-103059-20121130132720.patch text/plain 6817 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGZiNTliYWQwYWVmNDMy MWJkY2E1Mzc3NzVlZjU0NmUzNjFkMGFhYy4uN2VmZDliNzdjYmI4Y2VjMDVmYzdiODI2NDNkZTBh MDc0Y2Y1N2I4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTMwICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1JFR1JFU1NJT05dIFtTdHlsZXNdIFJ1bGUgZGlzYXBwZWFycyBpZiBlZGl0ZWQgc2Vs ZWN0b3IgZG9lcyBub3QgYWZmZWN0IHNlbGVjdGVkIG5vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzA1OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGVmZmVjdGl2ZWx5IHR1cm5z IFdlYkluc3BlY3Rvci5jc3NNb2RlbC5zZXRSdWxlU2VsZWN0b3IoKSBpbnRvIGEgX3VzZXJPcGVy YXRpb24KKyAgICAgICAgKGluIHRlcm1zIG9mIFN0eWxlc1NpZGViYXJQYW5lKSwgd2hpY2ggZmlu aXNoZXMgdXBvbiB0aGUgX2ZpbmlzaE9wZXJhdGlvbkFuZE1vdmVFZGl0b3IoKSBpbnZvY2F0aW9u LgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS51 cGRhdGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJv dG90eXBlLmZpbmlzaE9wZXJhdGlvbkFuZE1vdmVFZGl0b3IpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLnN1Y2Nlc3NDYWxsYmFjayk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuZWRp dGluZ1NlbGVjdG9yQ29tbWl0dGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxl UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVkaXRpbmdTZWxlY3RvckNvbW1pdHRlZCk6CisK IDIwMTItMTEtMzAgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IEZpeCB0eXBvcyBpbiBEYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQuY3BwIGFuZCBEYXRlVGlt ZVN5bWJvbGljRmllbGRFbGVtZW50LmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKaW5kZXggZjcxOTZhMWYyNWVk NjQwZmE2ZjVkNjBjNTVlNjljOTFhOGU1ZGY1MC4uMzE0ZmJiY2U3OTU5MWIxYjlhOTIwMDU1NjZm M2MzNjhlZmY4YmMwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCkBAIC05ODQsNiArOTg0LDggQEAgV2ViSW5z cGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogCiAgICAgdXBkYXRl OiBmdW5jdGlvbihmdWxsKQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMuc3R5bGVSdWxlLnNlbGVj dG9yVGV4dCkKKyAgICAgICAgICAgIHRoaXMuX3NlbGVjdG9yRWxlbWVudC50ZXh0Q29udGVudCA9 IHRoaXMuc3R5bGVSdWxlLnNlbGVjdG9yVGV4dDsKICAgICAgICAgaWYgKGZ1bGwpIHsKICAgICAg ICAgICAgIHRoaXMucHJvcGVydGllc1RyZWVPdXRsaW5lLnJlbW92ZUNoaWxkcmVuKCk7CiAgICAg ICAgICAgICB0aGlzLnBvcHVsYXRlZCA9IGZhbHNlOwpAQCAtMTI4OSw2ICsxMjkxLDggQEAgV2Vi SW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICAg ICAgcmV0dXJuIHRoaXMuX21vdmVFZGl0b3JGcm9tU2VsZWN0b3IobW92ZURpcmVjdGlvbik7CiAg ICAgICAgIH0KIAorICAgICAgICB2YXIgc2VsZWN0ZWROb2RlID0gdGhpcy5fcGFyZW50UGFuZS5u b2RlOworCiAgICAgICAgIGZ1bmN0aW9uIHN1Y2Nlc3NDYWxsYmFjayhuZXdSdWxlLCBkb2VzQWZm ZWN0U2VsZWN0ZWROb2RlKQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoIWRvZXNBZmZlY3RT ZWxlY3RlZE5vZGUpIHsKQEAgLTEzMDIsMTMgKzEzMDYsMjAgQEAgV2ViSW5zcGVjdG9yLlN0eWxl UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5ydWxlID0g bmV3UnVsZTsKICAgICAgICAgICAgIHRoaXMuc3R5bGVSdWxlID0geyBzZWN0aW9uOiB0aGlzLCBz dHlsZTogbmV3UnVsZS5zdHlsZSwgc2VsZWN0b3JUZXh0OiBuZXdSdWxlLnNlbGVjdG9yVGV4dCwg bWVkaWE6IG5ld1J1bGUubWVkaWEsIHNvdXJjZVVSTDogbmV3UnVsZS5zb3VyY2VVUkwsIHJ1bGU6 IG5ld1J1bGUgfTsKIAotICAgICAgICAgICAgdGhpcy5fcGFyZW50UGFuZS51cGRhdGUoKTsKKyAg ICAgICAgICAgIHRoaXMuX3BhcmVudFBhbmUudXBkYXRlKHNlbGVjdGVkTm9kZSk7CiAKLSAgICAg ICAgICAgIHRoaXMuX21vdmVFZGl0b3JGcm9tU2VsZWN0b3IobW92ZURpcmVjdGlvbik7CisgICAg ICAgICAgICBmaW5pc2hPcGVyYXRpb25BbmRNb3ZlRWRpdG9yLmNhbGwodGhpcywgbW92ZURpcmVj dGlvbik7CiAgICAgICAgIH0KIAotICAgICAgICB2YXIgc2VsZWN0ZWROb2RlID0gdGhpcy5fcGFy ZW50UGFuZS5ub2RlOwotICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuc2V0UnVsZVNlbGVj dG9yKHRoaXMucnVsZS5pZCwgc2VsZWN0ZWROb2RlID8gc2VsZWN0ZWROb2RlLmlkIDogMCwgbmV3 Q29udGVudCwgc3VjY2Vzc0NhbGxiYWNrLmJpbmQodGhpcyksIHRoaXMuX21vdmVFZGl0b3JGcm9t U2VsZWN0b3IuYmluZCh0aGlzLCBtb3ZlRGlyZWN0aW9uKSk7CisgICAgICAgIGZ1bmN0aW9uIGZp bmlzaE9wZXJhdGlvbkFuZE1vdmVFZGl0b3IoZGlyZWN0aW9uKQorICAgICAgICB7CisgICAgICAg ICAgICBkZWxldGUgdGhpcy5fcGFyZW50UGFuZS5fdXNlck9wZXJhdGlvbjsKKyAgICAgICAgICAg IHRoaXMuX21vdmVFZGl0b3JGcm9tU2VsZWN0b3IoZGlyZWN0aW9uKTsKKyAgICAgICAgfQorCisg ICAgICAgIC8vIFRoaXMgZ2V0cyBkZWxldGVkIGluIGZpbmlzaE9wZXJhdGlvbkFuZE1vdmVFZGl0 b3IoKSwgd2hpY2ggaXMgY2FsbGVkIGJvdGggb24gc3VjY2VzcyBhbmQgZmFpbHVyZS4KKyAgICAg ICAgdGhpcy5fcGFyZW50UGFuZS5fdXNlck9wZXJhdGlvbiA9IHRydWU7CisgICAgICAgIFdlYklu c3BlY3Rvci5jc3NNb2RlbC5zZXRSdWxlU2VsZWN0b3IodGhpcy5ydWxlLmlkLCBzZWxlY3RlZE5v ZGUgPyBzZWxlY3RlZE5vZGUuaWQgOiAwLCBuZXdDb250ZW50LCBzdWNjZXNzQ2FsbGJhY2suYmlu ZCh0aGlzKSwgZmluaXNoT3BlcmF0aW9uQW5kTW92ZUVkaXRvci5iaW5kKHRoaXMsIG1vdmVEaXJl Y3Rpb24pKTsKICAgICB9LAogCiAgICAgZWRpdGluZ1NlbGVjdG9yQ2FuY2VsbGVkOiBmdW5jdGlv bigpCkBAIC0xNDkyLDYgKzE1MDMsOCBAQCBXZWJJbnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRp ZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9wYXJlbnRQ YW5lLl91c2VyT3BlcmF0aW9uOwogICAgICAgICB9CiAKKyAgICAgICAgaWYgKG5ld0NvbnRlbnQp CisgICAgICAgICAgICBuZXdDb250ZW50ID0gbmV3Q29udGVudC50cmltKCk7CiAgICAgICAgIHRo aXMuX3BhcmVudFBhbmUuX3VzZXJPcGVyYXRpb24gPSB0cnVlOwogICAgICAgICBXZWJJbnNwZWN0 b3IuY3NzTW9kZWwuYWRkUnVsZSh0aGlzLnBhbmUubm9kZS5pZCwgbmV3Q29udGVudCwgc3VjY2Vz c0NhbGxiYWNrLmJpbmQodGhpcyksIHRoaXMuZWRpdGluZ1NlbGVjdG9yQ2FuY2VsbGVkLmJpbmQo dGhpcykpOwogICAgIH0sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNmUzYWZlYWM3OTE2YzdlMGU5NGViMDc2ODM3YTdjZmNh MmJlNWFkNy4uM2FiNzdlOTNhZWJlODI4OWQzNTE2Y2U3MGUxMjFhODJiY2M1ZDdhYSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDE3IEBACiAyMDEyLTExLTMwICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBj aHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1JFR1JFU1NJT05dIFtTdHls ZXNdIFJ1bGUgZGlzYXBwZWFycyBpZiBlZGl0ZWQgc2VsZWN0b3IgZG9lcyBub3QgYWZmZWN0IHNl bGVjdGVkIG5vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwMzA1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdC5qczoKKyAgICAgICAgKGlu aXRpYWxpemVfRWxlbWVudFRlc3QuSW5zcGVjdG9yVGVzdC5kdW1wU2VsZWN0ZWRFbGVtZW50U3R5 bGVzKToKKyAgICAgICAgICBBZGQgZHVtcGluZyBvZiB0aGUgW25vLWFmZmVjdF0gZmxhZyBmb3Ig cnVsZXMgbm90IGFmZmVjdGluZyB0aGUgY3VycmVudGx5IHNlbGVjdGVkIGVsZW1lbnQuCisgICAg ICAgICogaW5zcGVjdG9yL3N0eWxlcy9jb21taXQtc2VsZWN0b3ItZXhwZWN0ZWQudHh0OiBSZWJh c2VsaW5lLgorCisyMDEyLTExLTMwICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1 bS5vcmc+CisKICAgICAgICAgW0Nocm9taXVtXSBVbnJldmlld2VkLCBmYXN0L3RleHQvbGluZS1p bml0aWFsLWFuZC1maW5hbC1zd2FzaGVzLmh0bWwgbWlzc2luZyBleHBlY3RhdGlvbnMgb24gWFAg YWZ0ZXIgcjEzNjE1My4KIAogICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Rlc3RFeHBlY3Rh dGlvbnM6CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVt ZW50cy10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMt dGVzdC5qcwppbmRleCAxMTdjNGVjM2FjNzRhNzdiMTcxMDA5MzdmZjRmNTA0ZjdkMTFhOGU2Li4x NDcwZTdmY2I0YzZhZTA3Yzk3MDJhZTk2NWVjNzQ5NDQzMTJiNTdhIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0LmpzCisrKyBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRlc3QuanMKQEAgLTE1Myw3ICsx NTMsNyBAQCBJbnNwZWN0b3JUZXN0LmR1bXBTZWxlY3RlZEVsZW1lbnRTdHlsZXMgPSBmdW5jdGlv bihleGNsdWRlQ29tcHV0ZWQsIGV4Y2x1ZGVNYXRjaAogICAgICAgICAgICAgICAgIGNvbnRpbnVl OwogICAgICAgICAgICAgaWYgKHNlY3Rpb24uZWxlbWVudC5wcmV2aW91c1NpYmxpbmcgJiYgc2Vj dGlvbi5lbGVtZW50LnByZXZpb3VzU2libGluZy5jbGFzc05hbWUgPT09ICJzaWRlYmFyLXNlcGFy YXRvciIpCiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIj09PT09PT09 ICIgKyBzZWN0aW9uLmVsZW1lbnQucHJldmlvdXNTaWJsaW5nLnRleHRDb250ZW50ICsgIiA9PT09 PT09PSIpOwotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoc2VjdGlvbi5leHBh bmRlZCA/ICJbZXhwYW5kZWRdICIgOiAiW2NvbGxhcHNlZF0gIik7CisgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmFkZFJlc3VsdCgoc2VjdGlvbi5leHBhbmRlZCA/ICJbZXhwYW5kZWRdICIgOiAi W2NvbGxhcHNlZF0gIikgKyAoc2VjdGlvbi5ub0FmZmVjdCA/ICJbbm8tYWZmZWN0XSAiIDogIiIp KTsKICAgICAgICAgICAgIHZhciBjaGFpbkVudHJpZXMgPSBzZWN0aW9uLnRpdGxlRWxlbWVudC5j aGlsZHJlbjsKICAgICAgICAgICAgIGZvciAodmFyIGogPSAwOyBqIDwgY2hhaW5FbnRyaWVzLmxl bmd0aDsgKytqKSB7CiAgICAgICAgICAgICAgICAgdmFyIGNoYWluRW50cnkgPSBjaGFpbkVudHJp ZXNbal07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL2NvbW1pdC1z ZWxlY3Rvci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL2NvbW1p dC1zZWxlY3Rvci1leHBlY3RlZC50eHQKaW5kZXggMzkxNjUyMmY4NmYyZTIzZjY2Y2RmYjFlMGQw MmIzNzI3ZTBhNDkxZC4uMWFlNjI0NjExYzk3MTRkNWNlNGRmODlmNTUxNWVlOTFjNDdlYjM4ZSAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9jb21taXQtc2VsZWN0b3It ZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvY29tbWl0LXNl bGVjdG9yLWV4cGVjdGVkLnR4dApAQCAtMzcsNiArMzcsMTAgQEAgZWxlbWVudC5zdHlsZSAgeyAo KQogY29sb3I6IHJlZDsKIAogPT09PT09PT0gTWF0Y2hlZCBDU1MgUnVsZXMgPT09PT09PT0KK1tl eHBhbmRlZF0gW25vLWFmZmVjdF0gCisjaW5zcGVjdGVkY2hhbmdlZCAgeyAoY29tbWl0LXNlbGVj dG9yLmh0bWw6NCkKK2NvbG9yOiBncmVlbjsKKwogW2V4cGFuZGVkXSAKIGRpdiAgeyAodXNlciBh Z2VudCBzdHlsZXNoZWV0KQogZGlzcGxheTogYmxvY2s7Cg== 177210 2012-12-03 01:55:57 -0800 2012-12-03 04:45:29 -0800 Patch bug-103059-20121203135323.patch text/plain 9678 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWE5OWY0NWMwOWEwMDk1 NjkzZDEzYmQyNDFhMGU0MzhmNjlhNGZhNS4uOWE5OGQyNmQ2ZWE5YjJlZGNiODc4NTNhY2RjY2U1 Yzk1NzJhNzg3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDEyLTEyLTAzICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1JFR1JFU1NJT05dIFtTdHlsZXNdIFJ1bGUgZGlzYXBwZWFycyBpZiBlZGl0ZWQgc2Vs ZWN0b3IgZG9lcyBub3QgYWZmZWN0IHNlbGVjdGVkIG5vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzA1OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGVmZmVjdGl2ZWx5IHR1cm5z IFdlYkluc3BlY3Rvci5jc3NNb2RlbC5zZXRSdWxlU2VsZWN0b3IoKSBpbnRvIGEgX3VzZXJPcGVy YXRpb24KKyAgICAgICAgKGluIHRlcm1zIG9mIFN0eWxlc1NpZGViYXJQYW5lKSwgd2hpY2ggZmlu aXNoZXMgdXBvbiB0aGUgX2ZpbmlzaE9wZXJhdGlvbkFuZE1vdmVFZGl0b3IoKSBpbnZvY2F0aW9u LgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNTU1J1bGUpOiBGaXggc2VsZWN0b3JUZXh0IG5vdyB0aGF0IHIx MzYzNzAgaGFzIGxhbmRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1Np ZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rp b24ucHJvdG90eXBlLnVwZGF0ZSk6IFVwZGF0ZSB0aGUgc2VsZWN0b3IgdGV4dCBmcm9tIHRoZSBt b2RlbC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3Rv dHlwZS5fbWFya1NlbGVjdG9yTWF0Y2hlcyk6IFNldCB0aGUgInNlbGVjdG9yIiBjbGFzc05hbWUg cmVnYXJkbGVzcyBvZiB0aGUgbWF0Y2hlZCBzZWxlY3RvcnMgcHJlc2VuY2UuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuc3VjY2Vzc0NhbGxi YWNrKTogTWFrZSB1c2Ugb2YgdGhlIF91c2VyT3BlcmF0aW9uIGZsYWcuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuZmluaXNoT3BlcmF0aW9u QW5kTW92ZUVkaXRvcik6IERlbGV0ZSB0aGUgX3VzZXJPcGVyYXRpb24gZmxhZy4KKyAgICAgICAg KFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5lZGl0aW5nU2Vs ZWN0b3JDb21taXR0ZWQpOiBNYWtlIHVzZSBvZiB0aGUgX3VzZXJPcGVyYXRpb24gZmxhZy4KKyAg ICAgICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBl LmVkaXRpbmdTZWxlY3RvckNvbW1pdHRlZCk6IE1hcmsgc2VsZWN0b3IgbWF0Y2hlcy4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVk aXRpbmdTZWxlY3RvckNhbmNlbGxlZCk6IERlbGV0ZSB0aGUgX3VzZXJPcGVyYXRpb24gZmxhZy4K KworMjAxMi0xMi0wMyAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgor CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtTdHlsZXNdIFJldGFpbiBzZWxlY3RvciBjYXNlIGFz IHdyaXR0ZW4gaW4gdGhlIHNvdXJjZSBjb2RlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDMxMTgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4IDZhNmYxYzU1NTYwZGRlNjk1 OWNlNjNmN2QwYjFhYmQ2YjA1ZDk2MDcuLmVmNmQ3OWEyNzViODBhMWNjYjU4MjkxNGFjZjA3ZmY5 MDlkMmJkZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0NTU1N0eWxlTW9kZWwuanMKQEAgLTgwMCw3ICs4MDAsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTUnVs ZSA9IGZ1bmN0aW9uKHBheWxvYWQsIG1hdGNoaW5nU2VsZWN0b3JzKQogICAgIGlmIChtYXRjaGlu Z1NlbGVjdG9ycykKICAgICAgICAgdGhpcy5tYXRjaGluZ1NlbGVjdG9ycyA9IG1hdGNoaW5nU2Vs ZWN0b3JzOwogICAgIHRoaXMuc2VsZWN0b3JzID0gcGF5bG9hZC5zZWxlY3Rvckxpc3Quc2VsZWN0 b3JzOwotICAgIHRoaXMuc2VsZWN0b3JUZXh0ID0gcGF5bG9hZC5zZWxlY3Rvckxpc3QudGV4dDsK KyAgICB0aGlzLnNlbGVjdG9yVGV4dCA9IHRoaXMuc2VsZWN0b3JzLmpvaW4oIiwgIik7CiAgICAg dGhpcy5zZWxlY3RvclJhbmdlID0gcGF5bG9hZC5zZWxlY3Rvckxpc3QucmFuZ2U7CiAgICAgdGhp cy5zb3VyY2VMaW5lID0gcGF5bG9hZC5zb3VyY2VMaW5lOwogICAgIHRoaXMuc291cmNlVVJMID0g cGF5bG9hZC5zb3VyY2VVUkw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCA2MjNlNTI0MzljOGE5YThhN2E5 Yjc3NzA0N2MwNWFhOWYxY2EwMzRiLi44NDM2NDU1M2VlOTg0ZjIzNjMwNzU4ZmMwNmJjZTM3NDhh NGNmNjlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0 eWxlc1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAgLTg1MSw3ICs4NTEsNiBAQCBXZWJJbnNwZWN0b3Iu U3R5bGVQcm9wZXJ0aWVzU2VjdGlvbiA9IGZ1bmN0aW9uKHBhcmVudFBhbmUsIHN0eWxlUnVsZSwg ZWRpdGFibGUsCiAKICAgICB2YXIgc2VsZWN0b3JDb250YWluZXIgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJkaXYiKTsKICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJzcGFuIik7Ci0gICAgdGhpcy5fc2VsZWN0b3JFbGVtZW50LmFkZFN0eWxlQ2xh c3MoInNlbGVjdG9yLW1hdGNoZXMiKTsKICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQudGV4dENv bnRlbnQgPSBzdHlsZVJ1bGUuc2VsZWN0b3JUZXh0OwogICAgIHNlbGVjdG9yQ29udGFpbmVyLmFw cGVuZENoaWxkKHRoaXMuX3NlbGVjdG9yRWxlbWVudCk7CiAKQEAgLTk4NCw2ICs5ODMsOCBAQCBX ZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAKICAgICB1 cGRhdGU6IGZ1bmN0aW9uKGZ1bGwpCiAgICAgeworICAgICAgICBpZiAodGhpcy5zdHlsZVJ1bGUu c2VsZWN0b3JUZXh0KQorICAgICAgICAgICAgdGhpcy5fc2VsZWN0b3JFbGVtZW50LnRleHRDb250 ZW50ID0gdGhpcy5zdHlsZVJ1bGUuc2VsZWN0b3JUZXh0OwogICAgICAgICBpZiAoZnVsbCkgewog ICAgICAgICAgICAgdGhpcy5wcm9wZXJ0aWVzVHJlZU91dGxpbmUucmVtb3ZlQ2hpbGRyZW4oKTsK ICAgICAgICAgICAgIHRoaXMucG9wdWxhdGVkID0gZmFsc2U7CkBAIC0xMDg4LDYgKzEwODksNyBA QCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGlmICghcnVsZSkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICB0aGlzLl9zZWxl Y3RvckVsZW1lbnQuY2xhc3NOYW1lID0gInNlbGVjdG9yIjsKICAgICAgICAgdmFyIHNlbGVjdG9y cyA9IHJ1bGUuc2VsZWN0b3JzOwogICAgICAgICB2YXIgbWF0Y2hpbmdTZWxlY3RvcnMgPSBydWxl Lm1hdGNoaW5nU2VsZWN0b3JzOwogICAgICAgICBpZiAoIW1hdGNoaW5nU2VsZWN0b3JzKQpAQCAt MTExMSw3ICsxMTEzLDYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJv dG90eXBlID0gewogICAgICAgICAgICAgICAgIGZyYWdtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50 LmNyZWF0ZVRleHROb2RlKCIsICIpKTsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX3NlbGVj dG9yRWxlbWVudC5jbGFzc05hbWUgPSAic2VsZWN0b3IiOwogICAgICAgICB0aGlzLl9zZWxlY3Rv ckVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgdGhpcy5fc2VsZWN0b3JFbGVtZW50 LmFwcGVuZENoaWxkKGZyYWdtZW50KTsKICAgICB9LApAQCAtMTI4OSw2ICsxMjkwLDggQEAgV2Vi SW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICAg ICAgcmV0dXJuIHRoaXMuX21vdmVFZGl0b3JGcm9tU2VsZWN0b3IobW92ZURpcmVjdGlvbik7CiAg ICAgICAgIH0KIAorICAgICAgICB2YXIgc2VsZWN0ZWROb2RlID0gdGhpcy5fcGFyZW50UGFuZS5u b2RlOworCiAgICAgICAgIGZ1bmN0aW9uIHN1Y2Nlc3NDYWxsYmFjayhuZXdSdWxlLCBkb2VzQWZm ZWN0U2VsZWN0ZWROb2RlKQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoIWRvZXNBZmZlY3RT ZWxlY3RlZE5vZGUpIHsKQEAgLTEzMDIsMTMgKzEzMDUsMjAgQEAgV2ViSW5zcGVjdG9yLlN0eWxl UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5ydWxlID0g bmV3UnVsZTsKICAgICAgICAgICAgIHRoaXMuc3R5bGVSdWxlID0geyBzZWN0aW9uOiB0aGlzLCBz dHlsZTogbmV3UnVsZS5zdHlsZSwgc2VsZWN0b3JUZXh0OiBuZXdSdWxlLnNlbGVjdG9yVGV4dCwg bWVkaWE6IG5ld1J1bGUubWVkaWEsIHNvdXJjZVVSTDogbmV3UnVsZS5zb3VyY2VVUkwsIHJ1bGU6 IG5ld1J1bGUgfTsKIAotICAgICAgICAgICAgdGhpcy5fcGFyZW50UGFuZS51cGRhdGUoKTsKKyAg ICAgICAgICAgIHRoaXMuX3BhcmVudFBhbmUudXBkYXRlKHNlbGVjdGVkTm9kZSk7CiAKLSAgICAg ICAgICAgIHRoaXMuX21vdmVFZGl0b3JGcm9tU2VsZWN0b3IobW92ZURpcmVjdGlvbik7CisgICAg ICAgICAgICBmaW5pc2hPcGVyYXRpb25BbmRNb3ZlRWRpdG9yLmNhbGwodGhpcywgbW92ZURpcmVj dGlvbik7CiAgICAgICAgIH0KIAotICAgICAgICB2YXIgc2VsZWN0ZWROb2RlID0gdGhpcy5fcGFy ZW50UGFuZS5ub2RlOwotICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuc2V0UnVsZVNlbGVj dG9yKHRoaXMucnVsZS5pZCwgc2VsZWN0ZWROb2RlID8gc2VsZWN0ZWROb2RlLmlkIDogMCwgbmV3 Q29udGVudCwgc3VjY2Vzc0NhbGxiYWNrLmJpbmQodGhpcyksIHRoaXMuX21vdmVFZGl0b3JGcm9t U2VsZWN0b3IuYmluZCh0aGlzLCBtb3ZlRGlyZWN0aW9uKSk7CisgICAgICAgIGZ1bmN0aW9uIGZp bmlzaE9wZXJhdGlvbkFuZE1vdmVFZGl0b3IoZGlyZWN0aW9uKQorICAgICAgICB7CisgICAgICAg ICAgICBkZWxldGUgdGhpcy5fcGFyZW50UGFuZS5fdXNlck9wZXJhdGlvbjsKKyAgICAgICAgICAg IHRoaXMuX21vdmVFZGl0b3JGcm9tU2VsZWN0b3IoZGlyZWN0aW9uKTsKKyAgICAgICAgfQorCisg ICAgICAgIC8vIFRoaXMgZ2V0cyBkZWxldGVkIGluIGZpbmlzaE9wZXJhdGlvbkFuZE1vdmVFZGl0 b3IoKSwgd2hpY2ggaXMgY2FsbGVkIGJvdGggb24gc3VjY2VzcyBhbmQgZmFpbHVyZS4KKyAgICAg ICAgdGhpcy5fcGFyZW50UGFuZS5fdXNlck9wZXJhdGlvbiA9IHRydWU7CisgICAgICAgIFdlYklu c3BlY3Rvci5jc3NNb2RlbC5zZXRSdWxlU2VsZWN0b3IodGhpcy5ydWxlLmlkLCBzZWxlY3RlZE5v ZGUgPyBzZWxlY3RlZE5vZGUuaWQgOiAwLCBuZXdDb250ZW50LCBzdWNjZXNzQ2FsbGJhY2suYmlu ZCh0aGlzKSwgZmluaXNoT3BlcmF0aW9uQW5kTW92ZUVkaXRvci5iaW5kKHRoaXMsIG1vdmVEaXJl Y3Rpb24pKTsKICAgICB9LAogCiAgICAgZWRpdGluZ1NlbGVjdG9yQ2FuY2VsbGVkOiBmdW5jdGlv bigpCkBAIC0xNDg5LDE1ICsxNDk5LDE5IEBAIFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVy dGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKHRoaXMuZWxlbWVudC5w YXJlbnRFbGVtZW50KSAvLyBNaWdodCBoYXZlIGJlZW4gZGV0YWNoZWQgYWxyZWFkeS4KICAgICAg ICAgICAgICAgICB0aGlzLl9tb3ZlRWRpdG9yRnJvbVNlbGVjdG9yKG1vdmVEaXJlY3Rpb24pOwog CisgICAgICAgICAgICB0aGlzLl9tYXJrU2VsZWN0b3JNYXRjaGVzKCk7CiAgICAgICAgICAgICBk ZWxldGUgdGhpcy5fcGFyZW50UGFuZS5fdXNlck9wZXJhdGlvbjsKICAgICAgICAgfQogCisgICAg ICAgIGlmIChuZXdDb250ZW50KQorICAgICAgICAgICAgbmV3Q29udGVudCA9IG5ld0NvbnRlbnQu dHJpbSgpOwogICAgICAgICB0aGlzLl9wYXJlbnRQYW5lLl91c2VyT3BlcmF0aW9uID0gdHJ1ZTsK ICAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVsLmFkZFJ1bGUodGhpcy5wYW5lLm5vZGUuaWQs IG5ld0NvbnRlbnQsIHN1Y2Nlc3NDYWxsYmFjay5iaW5kKHRoaXMpLCB0aGlzLmVkaXRpbmdTZWxl Y3RvckNhbmNlbGxlZC5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAgZWRpdGluZ1NlbGVjdG9y Q2FuY2VsbGVkOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICBkZWxldGUgdGhpcy5fcGFyZW50 UGFuZS5fdXNlck9wZXJhdGlvbjsKICAgICAgICAgaWYgKCF0aGlzLmlzQmxhbmspIHsKICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5lZGl0 aW5nU2VsZWN0b3JDYW5jZWxsZWQuY2FsbCh0aGlzKTsKICAgICAgICAgICAgIHJldHVybjsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCA4ZjFkNmM3Njg5YjU3NzA0MjIxNDk3OTUzMjBjMTQzNzQyZTgyOWMxLi44MGJmYzk1N2Iw OTBjODZhNWU4MWYwNmFiZGQzZDEyZDM5ODlmNTlhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIw MTItMTItMDMgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAorICAg ICAgICBXZWIgSW5zcGVjdG9yOiBbUkVHUkVTU0lPTl0gW1N0eWxlc10gUnVsZSBkaXNhcHBlYXJz IGlmIGVkaXRlZCBzZWxlY3RvciBkb2VzIG5vdCBhZmZlY3Qgc2VsZWN0ZWQgbm9kZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzMDU5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2lu c3BlY3Rvci9lbGVtZW50cy10ZXN0LmpzOgorICAgICAgICAoaW5pdGlhbGl6ZV9FbGVtZW50VGVz dC5JbnNwZWN0b3JUZXN0LmR1bXBTZWxlY3RlZEVsZW1lbnRTdHlsZXMpOgorICAgICAgICAgIEFk ZCBkdW1waW5nIG9mIHRoZSBbbm8tYWZmZWN0XSBmbGFnIGZvciBydWxlcyBub3QgYWZmZWN0aW5n IHRoZSBjdXJyZW50bHkgc2VsZWN0ZWQgZWxlbWVudC4KKyAgICAgICAgKiBpbnNwZWN0b3Ivc3R5 bGVzL2NvbW1pdC1zZWxlY3Rvci1leHBlY3RlZC50eHQ6IFJlYmFzZWxpbmUuCisKKzIwMTItMTIt MDMgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKwogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBbU3R5bGVzXSBSZXRhaW4gc2VsZWN0b3IgY2FzZSBhcyB3cml0dGVuIGlu IHRoZSBzb3VyY2UgY29kZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTAzMTE4CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5z cGVjdG9yL2VsZW1lbnRzLXRlc3QuanMgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9lbGVtZW50cy10ZXN0LmpzCmluZGV4IDExN2M0ZWMzYWM3NGE3N2IxNzEwMDkzN2ZmNGY1MDRm N2QxMWE4ZTYuLjE0NzBlN2ZjYjRjNmFlMDdjOTcwMmFlOTY1ZWM3NDk0NDMxMmI1N2EgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRlc3QuanMK KysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdC5qcwpA QCAtMTUzLDcgKzE1Myw3IEBAIEluc3BlY3RvclRlc3QuZHVtcFNlbGVjdGVkRWxlbWVudFN0eWxl cyA9IGZ1bmN0aW9uKGV4Y2x1ZGVDb21wdXRlZCwgZXhjbHVkZU1hdGNoCiAgICAgICAgICAgICAg ICAgY29udGludWU7CiAgICAgICAgICAgICBpZiAoc2VjdGlvbi5lbGVtZW50LnByZXZpb3VzU2li bGluZyAmJiBzZWN0aW9uLmVsZW1lbnQucHJldmlvdXNTaWJsaW5nLmNsYXNzTmFtZSA9PT0gInNp ZGViYXItc2VwYXJhdG9yIikKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3Vs dCgiPT09PT09PT0gIiArIHNlY3Rpb24uZWxlbWVudC5wcmV2aW91c1NpYmxpbmcudGV4dENvbnRl bnQgKyAiID09PT09PT09Iik7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChz ZWN0aW9uLmV4cGFuZGVkID8gIltleHBhbmRlZF0gIiA6ICJbY29sbGFwc2VkXSAiKTsKKyAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KChzZWN0aW9uLmV4cGFuZGVkID8gIltleHBh bmRlZF0gIiA6ICJbY29sbGFwc2VkXSAiKSArIChzZWN0aW9uLm5vQWZmZWN0ID8gIltuby1hZmZl Y3RdICIgOiAiIikpOwogICAgICAgICAgICAgdmFyIGNoYWluRW50cmllcyA9IHNlY3Rpb24udGl0 bGVFbGVtZW50LmNoaWxkcmVuOwogICAgICAgICAgICAgZm9yICh2YXIgaiA9IDA7IGogPCBjaGFp bkVudHJpZXMubGVuZ3RoOyArK2opIHsKICAgICAgICAgICAgICAgICB2YXIgY2hhaW5FbnRyeSA9 IGNoYWluRW50cmllc1tqXTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHls ZXMvY29tbWl0LXNlbGVjdG9yLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9z dHlsZXMvY29tbWl0LXNlbGVjdG9yLWV4cGVjdGVkLnR4dAppbmRleCAzOTE2NTIyZjg2ZjJlMjNm NjZjZGZiMWUwZDAyYjM3MjdlMGE0OTFkLi5lZjEzZWIzNzUxNjAwNmY4YTUyMGUzMTI1MjRiZmNm Mjk4YjlhMzEyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL2NvbW1p dC1zZWxlY3Rvci1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxl cy9jb21taXQtc2VsZWN0b3ItZXhwZWN0ZWQudHh0CkBAIC0zNyw2ICszNywxMCBAQCBlbGVtZW50 LnN0eWxlICB7ICgpCiBjb2xvcjogcmVkOwogCiA9PT09PT09PSBNYXRjaGVkIENTUyBSdWxlcyA9 PT09PT09PQorW2V4cGFuZGVkXSBbbm8tYWZmZWN0XSAKKyNpbnNwZWN0ZWRDaGFuZ2VkICB7IChj b21taXQtc2VsZWN0b3IuaHRtbDo0KQorY29sb3I6IGdyZWVuOworCiBbZXhwYW5kZWRdIAogZGl2 ICB7ICh1c2VyIGFnZW50IHN0eWxlc2hlZXQpCiBkaXNwbGF5OiBibG9jazsK 177230 2012-12-03 04:45:34 -0800 2012-12-03 04:50:48 -0800 Patch bug-103059-20121203164300.patch text/plain 9674 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2Mzc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWZjMWIzMDUxN2RjZmU0 NWMxMWM1MmQyNWI3Yjk4Y2FlYWIxNGFiNy4uMDkyY2RhNjBjNTNmZDJkOGQ0MjU0MzFkOTg1ZDg0 NWY3ZjUzOWMyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTEyLTAzICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1JFR1JFU1NJT05dIFtTdHlsZXNdIFJ1bGUgZGlzYXBwZWFycyBpZiBlZGl0ZWQgc2Vs ZWN0b3IgZG9lcyBub3QgYWZmZWN0IHNlbGVjdGVkIG5vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzA1OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGVmZmVjdGl2ZWx5IHR1cm5z IFdlYkluc3BlY3Rvci5jc3NNb2RlbC5zZXRSdWxlU2VsZWN0b3IoKSBpbnRvIGEgX3VzZXJPcGVy YXRpb24KKyAgICAgICAgKGluIHRlcm1zIG9mIFN0eWxlc1NpZGViYXJQYW5lKSwgd2hpY2ggZmlu aXNoZXMgdXBvbiB0aGUgX2ZpbmlzaE9wZXJhdGlvbkFuZE1vdmVFZGl0b3IoKSBpbnZvY2F0aW9u LgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNTU1J1bGUpOiBGaXggc2VsZWN0b3JUZXh0IG5vdyB0aGF0IHIx MzYzNzAgaGFzIGxhbmRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1Np ZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rp b24ucHJvdG90eXBlLnVwZGF0ZSk6IFVwZGF0ZSB0aGUgc2VsZWN0b3IgdGV4dCBmcm9tIHRoZSBt b2RlbC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3Rv dHlwZS5fbWFya1NlbGVjdG9yTWF0Y2hlcyk6IFNldCB0aGUgInNlbGVjdG9yIiBjbGFzc05hbWUg cmVnYXJkbGVzcyBvZiB0aGUgbWF0Y2hlZCBzZWxlY3RvcnMgcHJlc2VuY2UuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuc3VjY2Vzc0NhbGxi YWNrKTogTWFrZSB1c2Ugb2YgdGhlIF91c2VyT3BlcmF0aW9uIGZsYWcuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuZmluaXNoT3BlcmF0aW9u QW5kTW92ZUVkaXRvcik6IERlbGV0ZSB0aGUgX3VzZXJPcGVyYXRpb24gZmxhZy4KKyAgICAgICAg KFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5lZGl0aW5nU2Vs ZWN0b3JDb21taXR0ZWQpOiBNYWtlIHVzZSBvZiB0aGUgX3VzZXJPcGVyYXRpb24gZmxhZy4KKyAg ICAgICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBl LmVkaXRpbmdTZWxlY3RvckNvbW1pdHRlZCk6IE1hcmsgc2VsZWN0b3IgbWF0Y2hlcy4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVk aXRpbmdTZWxlY3RvckNhbmNlbGxlZCk6IERlbGV0ZSB0aGUgX3VzZXJPcGVyYXRpb24gZmxhZy4K KwogMjAxMi0xMi0wMyAgQWxleGlzIE1lbmFyZCAgPGFsZXhpc0B3ZWJraXQub3JnPgogCiAgICAg ICAgIFtDU1MzIEJhY2tncm91bmRzIGFuZCBCb3JkZXJzXSBJbXBsZW1lbnQgQ1NTMyBiYWNrZ3Jv dW5kLXBvc2l0aW9uIG9mZnNldHMgcmVuZGVyaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4IDZhNmYxYzU1NTYwZGRl Njk1OWNlNjNmN2QwYjFhYmQ2YjA1ZDk2MDcuLmVmNmQ3OWEyNzViODBhMWNjYjU4MjkxNGFjZjA3 ZmY5MDlkMmJkZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQ1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NTU1N0eWxlTW9kZWwuanMKQEAgLTgwMCw3ICs4MDAsNyBAQCBXZWJJbnNwZWN0b3IuQ1NT UnVsZSA9IGZ1bmN0aW9uKHBheWxvYWQsIG1hdGNoaW5nU2VsZWN0b3JzKQogICAgIGlmIChtYXRj aGluZ1NlbGVjdG9ycykKICAgICAgICAgdGhpcy5tYXRjaGluZ1NlbGVjdG9ycyA9IG1hdGNoaW5n U2VsZWN0b3JzOwogICAgIHRoaXMuc2VsZWN0b3JzID0gcGF5bG9hZC5zZWxlY3Rvckxpc3Quc2Vs ZWN0b3JzOwotICAgIHRoaXMuc2VsZWN0b3JUZXh0ID0gcGF5bG9hZC5zZWxlY3Rvckxpc3QudGV4 dDsKKyAgICB0aGlzLnNlbGVjdG9yVGV4dCA9IHRoaXMuc2VsZWN0b3JzLmpvaW4oIiwgIik7CiAg ICAgdGhpcy5zZWxlY3RvclJhbmdlID0gcGF5bG9hZC5zZWxlY3Rvckxpc3QucmFuZ2U7CiAgICAg dGhpcy5zb3VyY2VMaW5lID0gcGF5bG9hZC5zb3VyY2VMaW5lOwogICAgIHRoaXMuc291cmNlVVJM ID0gcGF5bG9hZC5zb3VyY2VVUkw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCA2MjNlNTI0MzljOGE5YThh N2E5Yjc3NzA0N2MwNWFhOWYxY2EwMzRiLi5iYmMyZjM2YjE5ODY0NzNmMWYwY2JkNjdlNDMwNTUz MDZlOWM2NjQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1N0eWxlc1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAgLTg1MSw3ICs4NTEsNiBAQCBXZWJJbnNwZWN0 b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbiA9IGZ1bmN0aW9uKHBhcmVudFBhbmUsIHN0eWxlUnVs ZSwgZWRpdGFibGUsCiAKICAgICB2YXIgc2VsZWN0b3JDb250YWluZXIgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgdGhpcy5fc2VsZWN0b3JFbGVtZW50LmFkZFN0eWxl Q2xhc3MoInNlbGVjdG9yLW1hdGNoZXMiKTsKICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQudGV4 dENvbnRlbnQgPSBzdHlsZVJ1bGUuc2VsZWN0b3JUZXh0OwogICAgIHNlbGVjdG9yQ29udGFpbmVy LmFwcGVuZENoaWxkKHRoaXMuX3NlbGVjdG9yRWxlbWVudCk7CiAKQEAgLTk4NCw2ICs5ODMsOCBA QCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAKICAg ICB1cGRhdGU6IGZ1bmN0aW9uKGZ1bGwpCiAgICAgeworICAgICAgICBpZiAodGhpcy5zdHlsZVJ1 bGUuc2VsZWN0b3JUZXh0KQorICAgICAgICAgICAgdGhpcy5fc2VsZWN0b3JFbGVtZW50LnRleHRD b250ZW50ID0gdGhpcy5zdHlsZVJ1bGUuc2VsZWN0b3JUZXh0OwogICAgICAgICBpZiAoZnVsbCkg ewogICAgICAgICAgICAgdGhpcy5wcm9wZXJ0aWVzVHJlZU91dGxpbmUucmVtb3ZlQ2hpbGRyZW4o KTsKICAgICAgICAgICAgIHRoaXMucG9wdWxhdGVkID0gZmFsc2U7CkBAIC0xMDg4LDYgKzEwODks OSBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAg ICAgICAgIGlmICghcnVsZSkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICAvLyAuc2Vs ZWN0b3IgaXMgcmVuZGVyZWQgYXMgbm9uLWFmZmVjdGluZyBzZWxlY3RvciBieSBkZWZhdWx0Lgor ICAgICAgICBpZiAodGhpcy5ub0FmZmVjdCkKKyAgICAgICAgICAgIHRoaXMuX3NlbGVjdG9yRWxl bWVudC5jbGFzc05hbWUgPSAic2VsZWN0b3IiOwogICAgICAgICB2YXIgc2VsZWN0b3JzID0gcnVs ZS5zZWxlY3RvcnM7CiAgICAgICAgIHZhciBtYXRjaGluZ1NlbGVjdG9ycyA9IHJ1bGUubWF0Y2hp bmdTZWxlY3RvcnM7CiAgICAgICAgIGlmICghbWF0Y2hpbmdTZWxlY3RvcnMpCkBAIC0xMTExLDcg KzExMTUsNiBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICAgICAgZnJhZ21lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRl VGV4dE5vZGUoIiwgIikpOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fc2VsZWN0b3JFbGVt ZW50LmNsYXNzTmFtZSA9ICJzZWxlY3RvciI7CiAgICAgICAgIHRoaXMuX3NlbGVjdG9yRWxlbWVu dC5yZW1vdmVDaGlsZHJlbigpOwogICAgICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQuYXBwZW5k Q2hpbGQoZnJhZ21lbnQpOwogICAgIH0sCkBAIC0xMjg5LDYgKzEyOTIsOCBAQCBXZWJJbnNwZWN0 b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1 cm4gdGhpcy5fbW92ZUVkaXRvckZyb21TZWxlY3Rvcihtb3ZlRGlyZWN0aW9uKTsKICAgICAgICAg fQogCisgICAgICAgIHZhciBzZWxlY3RlZE5vZGUgPSB0aGlzLl9wYXJlbnRQYW5lLm5vZGU7CisK ICAgICAgICAgZnVuY3Rpb24gc3VjY2Vzc0NhbGxiYWNrKG5ld1J1bGUsIGRvZXNBZmZlY3RTZWxl Y3RlZE5vZGUpCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICghZG9lc0FmZmVjdFNlbGVjdGVk Tm9kZSkgewpAQCAtMTMwMiwxMyArMTMwNywyMCBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0 aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLnJ1bGUgPSBuZXdSdWxl OwogICAgICAgICAgICAgdGhpcy5zdHlsZVJ1bGUgPSB7IHNlY3Rpb246IHRoaXMsIHN0eWxlOiBu ZXdSdWxlLnN0eWxlLCBzZWxlY3RvclRleHQ6IG5ld1J1bGUuc2VsZWN0b3JUZXh0LCBtZWRpYTog bmV3UnVsZS5tZWRpYSwgc291cmNlVVJMOiBuZXdSdWxlLnNvdXJjZVVSTCwgcnVsZTogbmV3UnVs ZSB9OwogCi0gICAgICAgICAgICB0aGlzLl9wYXJlbnRQYW5lLnVwZGF0ZSgpOworICAgICAgICAg ICAgdGhpcy5fcGFyZW50UGFuZS51cGRhdGUoc2VsZWN0ZWROb2RlKTsKIAotICAgICAgICAgICAg dGhpcy5fbW92ZUVkaXRvckZyb21TZWxlY3Rvcihtb3ZlRGlyZWN0aW9uKTsKKyAgICAgICAgICAg IGZpbmlzaE9wZXJhdGlvbkFuZE1vdmVFZGl0b3IuY2FsbCh0aGlzLCBtb3ZlRGlyZWN0aW9uKTsK ICAgICAgICAgfQogCi0gICAgICAgIHZhciBzZWxlY3RlZE5vZGUgPSB0aGlzLl9wYXJlbnRQYW5l Lm5vZGU7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5jc3NNb2RlbC5zZXRSdWxlU2VsZWN0b3IodGhp cy5ydWxlLmlkLCBzZWxlY3RlZE5vZGUgPyBzZWxlY3RlZE5vZGUuaWQgOiAwLCBuZXdDb250ZW50 LCBzdWNjZXNzQ2FsbGJhY2suYmluZCh0aGlzKSwgdGhpcy5fbW92ZUVkaXRvckZyb21TZWxlY3Rv ci5iaW5kKHRoaXMsIG1vdmVEaXJlY3Rpb24pKTsKKyAgICAgICAgZnVuY3Rpb24gZmluaXNoT3Bl cmF0aW9uQW5kTW92ZUVkaXRvcihkaXJlY3Rpb24pCisgICAgICAgIHsKKyAgICAgICAgICAgIGRl bGV0ZSB0aGlzLl9wYXJlbnRQYW5lLl91c2VyT3BlcmF0aW9uOworICAgICAgICAgICAgdGhpcy5f bW92ZUVkaXRvckZyb21TZWxlY3RvcihkaXJlY3Rpb24pOworICAgICAgICB9CisKKyAgICAgICAg Ly8gVGhpcyBnZXRzIGRlbGV0ZWQgaW4gZmluaXNoT3BlcmF0aW9uQW5kTW92ZUVkaXRvcigpLCB3 aGljaCBpcyBjYWxsZWQgYm90aCBvbiBzdWNjZXNzIGFuZCBmYWlsdXJlLgorICAgICAgICB0aGlz Ll9wYXJlbnRQYW5lLl91c2VyT3BlcmF0aW9uID0gdHJ1ZTsKKyAgICAgICAgV2ViSW5zcGVjdG9y LmNzc01vZGVsLnNldFJ1bGVTZWxlY3Rvcih0aGlzLnJ1bGUuaWQsIHNlbGVjdGVkTm9kZSA/IHNl bGVjdGVkTm9kZS5pZCA6IDAsIG5ld0NvbnRlbnQsIHN1Y2Nlc3NDYWxsYmFjay5iaW5kKHRoaXMp LCBmaW5pc2hPcGVyYXRpb25BbmRNb3ZlRWRpdG9yLmJpbmQodGhpcywgbW92ZURpcmVjdGlvbikp OwogICAgIH0sCiAKICAgICBlZGl0aW5nU2VsZWN0b3JDYW5jZWxsZWQ6IGZ1bmN0aW9uKCkKQEAg LTE0ODksMTUgKzE1MDEsMTkgQEAgV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2Vj dGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAodGhpcy5lbGVtZW50LnBhcmVudEVs ZW1lbnQpIC8vIE1pZ2h0IGhhdmUgYmVlbiBkZXRhY2hlZCBhbHJlYWR5LgogICAgICAgICAgICAg ICAgIHRoaXMuX21vdmVFZGl0b3JGcm9tU2VsZWN0b3IobW92ZURpcmVjdGlvbik7CiAKKyAgICAg ICAgICAgIHRoaXMuX21hcmtTZWxlY3Rvck1hdGNoZXMoKTsKICAgICAgICAgICAgIGRlbGV0ZSB0 aGlzLl9wYXJlbnRQYW5lLl91c2VyT3BlcmF0aW9uOwogICAgICAgICB9CiAKKyAgICAgICAgaWYg KG5ld0NvbnRlbnQpCisgICAgICAgICAgICBuZXdDb250ZW50ID0gbmV3Q29udGVudC50cmltKCk7 CiAgICAgICAgIHRoaXMuX3BhcmVudFBhbmUuX3VzZXJPcGVyYXRpb24gPSB0cnVlOwogICAgICAg ICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuYWRkUnVsZSh0aGlzLnBhbmUubm9kZS5pZCwgbmV3Q29u dGVudCwgc3VjY2Vzc0NhbGxiYWNrLmJpbmQodGhpcyksIHRoaXMuZWRpdGluZ1NlbGVjdG9yQ2Fu Y2VsbGVkLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICBlZGl0aW5nU2VsZWN0b3JDYW5jZWxs ZWQ6IGZ1bmN0aW9uKCkKICAgICB7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9wYXJlbnRQYW5lLl91 c2VyT3BlcmF0aW9uOwogICAgICAgICBpZiAoIXRoaXMuaXNCbGFuaykgewogICAgICAgICAgICAg V2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVkaXRpbmdTZWxl Y3RvckNhbmNlbGxlZC5jYWxsKHRoaXMpOwogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDJj ZDBiN2Y3M2I0NmUxMTIxNWIxNzIzNmVmMWI1ZmI1Nzc2ZTE5MDcuLmFkYTkwNDExNTRjZjRhNmI0 MjdlNzMwZDMyNWNiY2FkM2Q0YTZiM2IgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0xMi0w MyAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IFtSRUdSRVNTSU9OXSBbU3R5bGVzXSBSdWxlIGRpc2FwcGVhcnMgaWYgZWRp dGVkIHNlbGVjdG9yIGRvZXMgbm90IGFmZmVjdCBzZWxlY3RlZCBub2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDMwNTkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9y L2VsZW1lbnRzLXRlc3QuanM6CisgICAgICAgIChpbml0aWFsaXplX0VsZW1lbnRUZXN0Lkluc3Bl Y3RvclRlc3QuZHVtcFNlbGVjdGVkRWxlbWVudFN0eWxlcyk6CisgICAgICAgICAgQWRkIGR1bXBp bmcgb2YgdGhlIFtuby1hZmZlY3RdIGZsYWcgZm9yIHJ1bGVzIG5vdCBhZmZlY3RpbmcgdGhlIGN1 cnJlbnRseSBzZWxlY3RlZCBlbGVtZW50LgorICAgICAgICAqIGluc3BlY3Rvci9zdHlsZXMvY29t bWl0LXNlbGVjdG9yLWV4cGVjdGVkLnR4dDogUmViYXNlbGluZS4KKwogMjAxMi0xMi0wMyAgQWxl eGlzIE1lbmFyZCAgPGFsZXhpc0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtDU1MzIEJhY2tncm91 bmRzIGFuZCBCb3JkZXJzXSBJbXBsZW1lbnQgQ1NTMyBiYWNrZ3JvdW5kLXBvc2l0aW9uIG9mZnNl dHMgcmVuZGVyaW5nLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0 b3IvZWxlbWVudHMtdGVzdC5qcyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2Vs ZW1lbnRzLXRlc3QuanMKaW5kZXggMTE3YzRlYzNhYzc0YTc3YjE3MTAwOTM3ZmY0ZjUwNGY3ZDEx YThlNi4uMTQ3MGU3ZmNiNGM2YWUwN2M5NzAyYWU5NjVlYzc0OTQ0MzEyYjU3YSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdC5qcworKysg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0LmpzCkBAIC0x NTMsNyArMTUzLDcgQEAgSW5zcGVjdG9yVGVzdC5kdW1wU2VsZWN0ZWRFbGVtZW50U3R5bGVzID0g ZnVuY3Rpb24oZXhjbHVkZUNvbXB1dGVkLCBleGNsdWRlTWF0Y2gKICAgICAgICAgICAgICAgICBj b250aW51ZTsKICAgICAgICAgICAgIGlmIChzZWN0aW9uLmVsZW1lbnQucHJldmlvdXNTaWJsaW5n ICYmIHNlY3Rpb24uZWxlbWVudC5wcmV2aW91c1NpYmxpbmcuY2xhc3NOYW1lID09PSAic2lkZWJh ci1zZXBhcmF0b3IiKQogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCI9 PT09PT09PSAiICsgc2VjdGlvbi5lbGVtZW50LnByZXZpb3VzU2libGluZy50ZXh0Q29udGVudCAr ICIgPT09PT09PT0iKTsKLSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KHNlY3Rp b24uZXhwYW5kZWQgPyAiW2V4cGFuZGVkXSAiIDogIltjb2xsYXBzZWRdICIpOworICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoKHNlY3Rpb24uZXhwYW5kZWQgPyAiW2V4cGFuZGVk XSAiIDogIltjb2xsYXBzZWRdICIpICsgKHNlY3Rpb24ubm9BZmZlY3QgPyAiW25vLWFmZmVjdF0g IiA6ICIiKSk7CiAgICAgICAgICAgICB2YXIgY2hhaW5FbnRyaWVzID0gc2VjdGlvbi50aXRsZUVs ZW1lbnQuY2hpbGRyZW47CiAgICAgICAgICAgICBmb3IgKHZhciBqID0gMDsgaiA8IGNoYWluRW50 cmllcy5sZW5ndGg7ICsraikgewogICAgICAgICAgICAgICAgIHZhciBjaGFpbkVudHJ5ID0gY2hh aW5FbnRyaWVzW2pdOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9j b21taXQtc2VsZWN0b3ItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxl cy9jb21taXQtc2VsZWN0b3ItZXhwZWN0ZWQudHh0CmluZGV4IDM5MTY1MjJmODZmMmUyM2Y2NmNk ZmIxZTBkMDJiMzcyN2UwYTQ5MWQuLmVmMTNlYjM3NTE2MDA2ZjhhNTIwZTMxMjUyNGJmY2YyOThi OWEzMTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvY29tbWl0LXNl bGVjdG9yLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL2Nv bW1pdC1zZWxlY3Rvci1leHBlY3RlZC50eHQKQEAgLTM3LDYgKzM3LDEwIEBAIGVsZW1lbnQuc3R5 bGUgIHsgKCkKIGNvbG9yOiByZWQ7CiAKID09PT09PT09IE1hdGNoZWQgQ1NTIFJ1bGVzID09PT09 PT09CitbZXhwYW5kZWRdIFtuby1hZmZlY3RdIAorI2luc3BlY3RlZENoYW5nZWQgIHsgKGNvbW1p dC1zZWxlY3Rvci5odG1sOjQpCitjb2xvcjogZ3JlZW47CisKIFtleHBhbmRlZF0gCiBkaXYgIHsg KHVzZXIgYWdlbnQgc3R5bGVzaGVldCkKIGRpc3BsYXk6IGJsb2NrOwo= 177231 2012-12-03 04:50:53 -0800 2012-12-03 10:56:41 -0800 Patch bug-103059-20121203164819.patch text/plain 9950 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2Mzc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWZjMWIzMDUxN2RjZmU0 NWMxMWM1MmQyNWI3Yjk4Y2FlYWIxNGFiNy4uMDkyY2RhNjBjNTNmZDJkOGQ0MjU0MzFkOTg1ZDg0 NWY3ZjUzOWMyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTEyLTAzICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1JFR1JFU1NJT05dIFtTdHlsZXNdIFJ1bGUgZGlzYXBwZWFycyBpZiBlZGl0ZWQgc2Vs ZWN0b3IgZG9lcyBub3QgYWZmZWN0IHNlbGVjdGVkIG5vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzA1OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGVmZmVjdGl2ZWx5IHR1cm5z IFdlYkluc3BlY3Rvci5jc3NNb2RlbC5zZXRSdWxlU2VsZWN0b3IoKSBpbnRvIGEgX3VzZXJPcGVy YXRpb24KKyAgICAgICAgKGluIHRlcm1zIG9mIFN0eWxlc1NpZGViYXJQYW5lKSwgd2hpY2ggZmlu aXNoZXMgdXBvbiB0aGUgX2ZpbmlzaE9wZXJhdGlvbkFuZE1vdmVFZGl0b3IoKSBpbnZvY2F0aW9u LgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNTU1J1bGUpOiBGaXggc2VsZWN0b3JUZXh0IG5vdyB0aGF0IHIx MzYzNzAgaGFzIGxhbmRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1Np ZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rp b24ucHJvdG90eXBlLnVwZGF0ZSk6IFVwZGF0ZSB0aGUgc2VsZWN0b3IgdGV4dCBmcm9tIHRoZSBt b2RlbC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3Rv dHlwZS5fbWFya1NlbGVjdG9yTWF0Y2hlcyk6IFNldCB0aGUgInNlbGVjdG9yIiBjbGFzc05hbWUg cmVnYXJkbGVzcyBvZiB0aGUgbWF0Y2hlZCBzZWxlY3RvcnMgcHJlc2VuY2UuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuc3VjY2Vzc0NhbGxi YWNrKTogTWFrZSB1c2Ugb2YgdGhlIF91c2VyT3BlcmF0aW9uIGZsYWcuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuZmluaXNoT3BlcmF0aW9u QW5kTW92ZUVkaXRvcik6IERlbGV0ZSB0aGUgX3VzZXJPcGVyYXRpb24gZmxhZy4KKyAgICAgICAg KFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5lZGl0aW5nU2Vs ZWN0b3JDb21taXR0ZWQpOiBNYWtlIHVzZSBvZiB0aGUgX3VzZXJPcGVyYXRpb24gZmxhZy4KKyAg ICAgICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBl LmVkaXRpbmdTZWxlY3RvckNvbW1pdHRlZCk6IE1hcmsgc2VsZWN0b3IgbWF0Y2hlcy4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVk aXRpbmdTZWxlY3RvckNhbmNlbGxlZCk6IERlbGV0ZSB0aGUgX3VzZXJPcGVyYXRpb24gZmxhZy4K KwogMjAxMi0xMi0wMyAgQWxleGlzIE1lbmFyZCAgPGFsZXhpc0B3ZWJraXQub3JnPgogCiAgICAg ICAgIFtDU1MzIEJhY2tncm91bmRzIGFuZCBCb3JkZXJzXSBJbXBsZW1lbnQgQ1NTMyBiYWNrZ3Jv dW5kLXBvc2l0aW9uIG9mZnNldHMgcmVuZGVyaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4IDZhNmYxYzU1NTYwZGRl Njk1OWNlNjNmN2QwYjFhYmQ2YjA1ZDk2MDcuLmVmNmQ3OWEyNzViODBhMWNjYjU4MjkxNGFjZjA3 ZmY5MDlkMmJkZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQ1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NTU1N0eWxlTW9kZWwuanMKQEAgLTgwMCw3ICs4MDAsNyBAQCBXZWJJbnNwZWN0b3IuQ1NT UnVsZSA9IGZ1bmN0aW9uKHBheWxvYWQsIG1hdGNoaW5nU2VsZWN0b3JzKQogICAgIGlmIChtYXRj aGluZ1NlbGVjdG9ycykKICAgICAgICAgdGhpcy5tYXRjaGluZ1NlbGVjdG9ycyA9IG1hdGNoaW5n U2VsZWN0b3JzOwogICAgIHRoaXMuc2VsZWN0b3JzID0gcGF5bG9hZC5zZWxlY3Rvckxpc3Quc2Vs ZWN0b3JzOwotICAgIHRoaXMuc2VsZWN0b3JUZXh0ID0gcGF5bG9hZC5zZWxlY3Rvckxpc3QudGV4 dDsKKyAgICB0aGlzLnNlbGVjdG9yVGV4dCA9IHRoaXMuc2VsZWN0b3JzLmpvaW4oIiwgIik7CiAg ICAgdGhpcy5zZWxlY3RvclJhbmdlID0gcGF5bG9hZC5zZWxlY3Rvckxpc3QucmFuZ2U7CiAgICAg dGhpcy5zb3VyY2VMaW5lID0gcGF5bG9hZC5zb3VyY2VMaW5lOwogICAgIHRoaXMuc291cmNlVVJM ID0gcGF5bG9hZC5zb3VyY2VVUkw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCA2MjNlNTI0MzljOGE5YThh N2E5Yjc3NzA0N2MwNWFhOWYxY2EwMzRiLi42OGE5NGVkMmYxZGFiYTBhYmI5YmFlNGZlYTdmZDA1 N2QyMGE5NGFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1N0eWxlc1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAgLTg1MSw3ICs4NTEsNiBAQCBXZWJJbnNwZWN0 b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbiA9IGZ1bmN0aW9uKHBhcmVudFBhbmUsIHN0eWxlUnVs ZSwgZWRpdGFibGUsCiAKICAgICB2YXIgc2VsZWN0b3JDb250YWluZXIgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgdGhpcy5fc2VsZWN0b3JFbGVtZW50LmFkZFN0eWxl Q2xhc3MoInNlbGVjdG9yLW1hdGNoZXMiKTsKICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQudGV4 dENvbnRlbnQgPSBzdHlsZVJ1bGUuc2VsZWN0b3JUZXh0OwogICAgIHNlbGVjdG9yQ29udGFpbmVy LmFwcGVuZENoaWxkKHRoaXMuX3NlbGVjdG9yRWxlbWVudCk7CiAKQEAgLTk4NCw2ICs5ODMsOCBA QCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAKICAg ICB1cGRhdGU6IGZ1bmN0aW9uKGZ1bGwpCiAgICAgeworICAgICAgICBpZiAodGhpcy5zdHlsZVJ1 bGUuc2VsZWN0b3JUZXh0KQorICAgICAgICAgICAgdGhpcy5fc2VsZWN0b3JFbGVtZW50LnRleHRD b250ZW50ID0gdGhpcy5zdHlsZVJ1bGUuc2VsZWN0b3JUZXh0OwogICAgICAgICBpZiAoZnVsbCkg ewogICAgICAgICAgICAgdGhpcy5wcm9wZXJ0aWVzVHJlZU91dGxpbmUucmVtb3ZlQ2hpbGRyZW4o KTsKICAgICAgICAgICAgIHRoaXMucG9wdWxhdGVkID0gZmFsc2U7CkBAIC0xMDg4LDExICsxMDg5 LDE0IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsK ICAgICAgICAgaWYgKCFydWxlKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBz ZWxlY3RvcnMgPSBydWxlLnNlbGVjdG9yczsKICAgICAgICAgdmFyIG1hdGNoaW5nU2VsZWN0b3Jz ID0gcnVsZS5tYXRjaGluZ1NlbGVjdG9yczsKKyAgICAgICAgLy8gLnNlbGVjdG9yIGlzIHJlbmRl cmVkIGFzIG5vbi1hZmZlY3Rpbmcgc2VsZWN0b3IgYnkgZGVmYXVsdC4KKyAgICAgICAgaWYgKHRo aXMubm9BZmZlY3QgfHwgbWF0Y2hpbmdTZWxlY3RvcnMpCisgICAgICAgICAgICB0aGlzLl9zZWxl Y3RvckVsZW1lbnQuY2xhc3NOYW1lID0gInNlbGVjdG9yIjsKICAgICAgICAgaWYgKCFtYXRjaGlu Z1NlbGVjdG9ycykKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICB2YXIgc2VsZWN0b3Jz ID0gcnVsZS5zZWxlY3RvcnM7CiAgICAgICAgIHZhciBmcmFnbWVudCA9IGRvY3VtZW50LmNyZWF0 ZURvY3VtZW50RnJhZ21lbnQoKTsKICAgICAgICAgdmFyIGN1cnJlbnRNYXRjaCA9IDA7CiAgICAg ICAgIGZvciAodmFyIGkgPSAwLCBsYXN0U2VsZWN0b3JJbmRleCA9IHNlbGVjdG9ycy5sZW5ndGgg LSAxOyBpIDw9IGxhc3RTZWxlY3RvckluZGV4IDsgKytpKSB7CkBAIC0xMTExLDcgKzExMTUsNiBA QCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICAgICAgZnJhZ21lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUo IiwgIikpOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fc2VsZWN0b3JFbGVtZW50LmNsYXNz TmFtZSA9ICJzZWxlY3RvciI7CiAgICAgICAgIHRoaXMuX3NlbGVjdG9yRWxlbWVudC5yZW1vdmVD aGlsZHJlbigpOwogICAgICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQuYXBwZW5kQ2hpbGQoZnJh Z21lbnQpOwogICAgIH0sCkBAIC0xMjg5LDYgKzEyOTIsOCBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQ cm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm4gdGhpcy5f bW92ZUVkaXRvckZyb21TZWxlY3Rvcihtb3ZlRGlyZWN0aW9uKTsKICAgICAgICAgfQogCisgICAg ICAgIHZhciBzZWxlY3RlZE5vZGUgPSB0aGlzLl9wYXJlbnRQYW5lLm5vZGU7CisKICAgICAgICAg ZnVuY3Rpb24gc3VjY2Vzc0NhbGxiYWNrKG5ld1J1bGUsIGRvZXNBZmZlY3RTZWxlY3RlZE5vZGUp CiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICghZG9lc0FmZmVjdFNlbGVjdGVkTm9kZSkgewpA QCAtMTMwMiwxMyArMTMwNywyMCBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlv bi5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLnJ1bGUgPSBuZXdSdWxlOwogICAgICAg ICAgICAgdGhpcy5zdHlsZVJ1bGUgPSB7IHNlY3Rpb246IHRoaXMsIHN0eWxlOiBuZXdSdWxlLnN0 eWxlLCBzZWxlY3RvclRleHQ6IG5ld1J1bGUuc2VsZWN0b3JUZXh0LCBtZWRpYTogbmV3UnVsZS5t ZWRpYSwgc291cmNlVVJMOiBuZXdSdWxlLnNvdXJjZVVSTCwgcnVsZTogbmV3UnVsZSB9OwogCi0g ICAgICAgICAgICB0aGlzLl9wYXJlbnRQYW5lLnVwZGF0ZSgpOworICAgICAgICAgICAgdGhpcy5f cGFyZW50UGFuZS51cGRhdGUoc2VsZWN0ZWROb2RlKTsKIAotICAgICAgICAgICAgdGhpcy5fbW92 ZUVkaXRvckZyb21TZWxlY3Rvcihtb3ZlRGlyZWN0aW9uKTsKKyAgICAgICAgICAgIGZpbmlzaE9w ZXJhdGlvbkFuZE1vdmVFZGl0b3IuY2FsbCh0aGlzLCBtb3ZlRGlyZWN0aW9uKTsKICAgICAgICAg fQogCi0gICAgICAgIHZhciBzZWxlY3RlZE5vZGUgPSB0aGlzLl9wYXJlbnRQYW5lLm5vZGU7Ci0g ICAgICAgIFdlYkluc3BlY3Rvci5jc3NNb2RlbC5zZXRSdWxlU2VsZWN0b3IodGhpcy5ydWxlLmlk LCBzZWxlY3RlZE5vZGUgPyBzZWxlY3RlZE5vZGUuaWQgOiAwLCBuZXdDb250ZW50LCBzdWNjZXNz Q2FsbGJhY2suYmluZCh0aGlzKSwgdGhpcy5fbW92ZUVkaXRvckZyb21TZWxlY3Rvci5iaW5kKHRo aXMsIG1vdmVEaXJlY3Rpb24pKTsKKyAgICAgICAgZnVuY3Rpb24gZmluaXNoT3BlcmF0aW9uQW5k TW92ZUVkaXRvcihkaXJlY3Rpb24pCisgICAgICAgIHsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlz Ll9wYXJlbnRQYW5lLl91c2VyT3BlcmF0aW9uOworICAgICAgICAgICAgdGhpcy5fbW92ZUVkaXRv ckZyb21TZWxlY3RvcihkaXJlY3Rpb24pOworICAgICAgICB9CisKKyAgICAgICAgLy8gVGhpcyBn ZXRzIGRlbGV0ZWQgaW4gZmluaXNoT3BlcmF0aW9uQW5kTW92ZUVkaXRvcigpLCB3aGljaCBpcyBj YWxsZWQgYm90aCBvbiBzdWNjZXNzIGFuZCBmYWlsdXJlLgorICAgICAgICB0aGlzLl9wYXJlbnRQ YW5lLl91c2VyT3BlcmF0aW9uID0gdHJ1ZTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVs LnNldFJ1bGVTZWxlY3Rvcih0aGlzLnJ1bGUuaWQsIHNlbGVjdGVkTm9kZSA/IHNlbGVjdGVkTm9k ZS5pZCA6IDAsIG5ld0NvbnRlbnQsIHN1Y2Nlc3NDYWxsYmFjay5iaW5kKHRoaXMpLCBmaW5pc2hP cGVyYXRpb25BbmRNb3ZlRWRpdG9yLmJpbmQodGhpcywgbW92ZURpcmVjdGlvbikpOwogICAgIH0s CiAKICAgICBlZGl0aW5nU2VsZWN0b3JDYW5jZWxsZWQ6IGZ1bmN0aW9uKCkKQEAgLTE0ODksMTUg KzE1MDEsMTkgQEAgV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAodGhpcy5lbGVtZW50LnBhcmVudEVsZW1lbnQpIC8v IE1pZ2h0IGhhdmUgYmVlbiBkZXRhY2hlZCBhbHJlYWR5LgogICAgICAgICAgICAgICAgIHRoaXMu X21vdmVFZGl0b3JGcm9tU2VsZWN0b3IobW92ZURpcmVjdGlvbik7CiAKKyAgICAgICAgICAgIHRo aXMuX21hcmtTZWxlY3Rvck1hdGNoZXMoKTsKICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9wYXJl bnRQYW5lLl91c2VyT3BlcmF0aW9uOwogICAgICAgICB9CiAKKyAgICAgICAgaWYgKG5ld0NvbnRl bnQpCisgICAgICAgICAgICBuZXdDb250ZW50ID0gbmV3Q29udGVudC50cmltKCk7CiAgICAgICAg IHRoaXMuX3BhcmVudFBhbmUuX3VzZXJPcGVyYXRpb24gPSB0cnVlOwogICAgICAgICBXZWJJbnNw ZWN0b3IuY3NzTW9kZWwuYWRkUnVsZSh0aGlzLnBhbmUubm9kZS5pZCwgbmV3Q29udGVudCwgc3Vj Y2Vzc0NhbGxiYWNrLmJpbmQodGhpcyksIHRoaXMuZWRpdGluZ1NlbGVjdG9yQ2FuY2VsbGVkLmJp bmQodGhpcykpOwogICAgIH0sCiAKICAgICBlZGl0aW5nU2VsZWN0b3JDYW5jZWxsZWQ6IGZ1bmN0 aW9uKCkKICAgICB7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9wYXJlbnRQYW5lLl91c2VyT3BlcmF0 aW9uOwogICAgICAgICBpZiAoIXRoaXMuaXNCbGFuaykgewogICAgICAgICAgICAgV2ViSW5zcGVj dG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVkaXRpbmdTZWxlY3RvckNhbmNl bGxlZC5jYWxsKHRoaXMpOwogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDJjZDBiN2Y3M2I0 NmUxMTIxNWIxNzIzNmVmMWI1ZmI1Nzc2ZTE5MDcuLmFkYTkwNDExNTRjZjRhNmI0MjdlNzMwZDMy NWNiY2FkM2Q0YTZiM2IgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0xMi0wMyAgQWxleGFu ZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtSRUdSRVNTSU9OXSBbU3R5bGVzXSBSdWxlIGRpc2FwcGVhcnMgaWYgZWRpdGVkIHNlbGVj dG9yIGRvZXMgbm90IGFmZmVjdCBzZWxlY3RlZCBub2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDMwNTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRz LXRlc3QuanM6CisgICAgICAgIChpbml0aWFsaXplX0VsZW1lbnRUZXN0Lkluc3BlY3RvclRlc3Qu ZHVtcFNlbGVjdGVkRWxlbWVudFN0eWxlcyk6CisgICAgICAgICAgQWRkIGR1bXBpbmcgb2YgdGhl IFtuby1hZmZlY3RdIGZsYWcgZm9yIHJ1bGVzIG5vdCBhZmZlY3RpbmcgdGhlIGN1cnJlbnRseSBz ZWxlY3RlZCBlbGVtZW50LgorICAgICAgICAqIGluc3BlY3Rvci9zdHlsZXMvY29tbWl0LXNlbGVj dG9yLWV4cGVjdGVkLnR4dDogUmViYXNlbGluZS4KKwogMjAxMi0xMi0wMyAgQWxleGlzIE1lbmFy ZCAgPGFsZXhpc0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtDU1MzIEJhY2tncm91bmRzIGFuZCBC b3JkZXJzXSBJbXBsZW1lbnQgQ1NTMyBiYWNrZ3JvdW5kLXBvc2l0aW9uIG9mZnNldHMgcmVuZGVy aW5nLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZWxlbWVu dHMtdGVzdC5qcyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRl c3QuanMKaW5kZXggMTE3YzRlYzNhYzc0YTc3YjE3MTAwOTM3ZmY0ZjUwNGY3ZDExYThlNi4uMTQ3 MGU3ZmNiNGM2YWUwN2M5NzAyYWU5NjVlYzc0OTQ0MzEyYjU3YSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdC5qcworKysgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0LmpzCkBAIC0xNTMsNyArMTUz LDcgQEAgSW5zcGVjdG9yVGVzdC5kdW1wU2VsZWN0ZWRFbGVtZW50U3R5bGVzID0gZnVuY3Rpb24o ZXhjbHVkZUNvbXB1dGVkLCBleGNsdWRlTWF0Y2gKICAgICAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgICAgIGlmIChzZWN0aW9uLmVsZW1lbnQucHJldmlvdXNTaWJsaW5nICYmIHNlY3Rp b24uZWxlbWVudC5wcmV2aW91c1NpYmxpbmcuY2xhc3NOYW1lID09PSAic2lkZWJhci1zZXBhcmF0 b3IiKQogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCI9PT09PT09PSAi ICsgc2VjdGlvbi5lbGVtZW50LnByZXZpb3VzU2libGluZy50ZXh0Q29udGVudCArICIgPT09PT09 PT0iKTsKLSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KHNlY3Rpb24uZXhwYW5k ZWQgPyAiW2V4cGFuZGVkXSAiIDogIltjb2xsYXBzZWRdICIpOworICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5hZGRSZXN1bHQoKHNlY3Rpb24uZXhwYW5kZWQgPyAiW2V4cGFuZGVkXSAiIDogIltj b2xsYXBzZWRdICIpICsgKHNlY3Rpb24ubm9BZmZlY3QgPyAiW25vLWFmZmVjdF0gIiA6ICIiKSk7 CiAgICAgICAgICAgICB2YXIgY2hhaW5FbnRyaWVzID0gc2VjdGlvbi50aXRsZUVsZW1lbnQuY2hp bGRyZW47CiAgICAgICAgICAgICBmb3IgKHZhciBqID0gMDsgaiA8IGNoYWluRW50cmllcy5sZW5n dGg7ICsraikgewogICAgICAgICAgICAgICAgIHZhciBjaGFpbkVudHJ5ID0gY2hhaW5FbnRyaWVz W2pdOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9jb21taXQtc2Vs ZWN0b3ItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9jb21taXQt c2VsZWN0b3ItZXhwZWN0ZWQudHh0CmluZGV4IDM5MTY1MjJmODZmMmUyM2Y2NmNkZmIxZTBkMDJi MzcyN2UwYTQ5MWQuLmVmMTNlYjM3NTE2MDA2ZjhhNTIwZTMxMjUyNGJmY2YyOThiOWEzMTIgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvY29tbWl0LXNlbGVjdG9yLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL2NvbW1pdC1zZWxl Y3Rvci1leHBlY3RlZC50eHQKQEAgLTM3LDYgKzM3LDEwIEBAIGVsZW1lbnQuc3R5bGUgIHsgKCkK IGNvbG9yOiByZWQ7CiAKID09PT09PT09IE1hdGNoZWQgQ1NTIFJ1bGVzID09PT09PT09CitbZXhw YW5kZWRdIFtuby1hZmZlY3RdIAorI2luc3BlY3RlZENoYW5nZWQgIHsgKGNvbW1pdC1zZWxlY3Rv ci5odG1sOjQpCitjb2xvcjogZ3JlZW47CisKIFtleHBhbmRlZF0gCiBkaXYgIHsgKHVzZXIgYWdl bnQgc3R5bGVzaGVldCkKIGRpc3BsYXk6IGJsb2NrOwo=