101845 2012-11-10 11:41:25 -0800 Web Inspector: get rid of enter/exitTextChangeMode in the editor 2012-11-13 01:29:50 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 763692 0 pfeldman 2012-11-10 11:41:25 -0800 They seem to do nothing. 763694 1 173464 pfeldman 2012-11-10 11:44:09 -0800 Created attachment 173464 Patch 763795 2 173490 pfeldman 2012-11-10 23:38:50 -0800 Created attachment 173490 [Patch] rebaselined 763836 3 173503 pfeldman 2012-11-11 06:11:53 -0800 Created attachment 173503 [Patch] rebaselined 765391 4 pfeldman 2012-11-13 01:29:50 -0800 Committed r134387: <http://trac.webkit.org/changeset/134387> 173464 2012-11-10 11:44:09 -0800 2012-11-10 23:38:44 -0800 Patch bug-101845-20121110234214.patch text/plain 11367 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGUzZWYxN2U5MDBlNzVi M2JhOWI3YzU4OGE3MGEwZWZlZmI1MjUxNy4uM2ExNWIxZDQyNGFkZGRhMTQ2YWM0YTU2MDc3NGY5 NTg4YmMzMzY5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEyLTExLTEwICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGdldCByaWQgb2YgZW50ZXIvZXhpdFRleHRDaGFuZ2VNb2RlIGluIHRoZSBlZGl0b3IKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTg0NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXkgc2VlbSB0 byBkbyBub3RoaW5nLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4 dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWZhdWx0VGV4dEVkaXRvci5wcm90 b3R5cGUuX3RleHRDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWZhdWx0VGV4dEVk aXRvci5wcm90b3R5cGUuZWRpdFJhbmdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpblBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVs LnByb3RvdHlwZS5oYW5kbGVVbmRvUmVkbyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVk aXRvck1haW5QYW5lbC5wcm90b3R5cGUuaGFuZGxlRW50ZXJLZXkuZ2V0IHZhcik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuaGFuZGxlRW50ZXJL ZXkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBl Ll9hcHBseURvbVVwZGF0ZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dEVk aXRvck1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNb2RlbC5lbmRz V2l0aEJyYWNrZXRSZWdleC4pOgorCisyMDEyLTExLTEwICBQYXZlbCBGZWxkbWFuICA8cGZlbGRt YW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1vdmUgaW5kZW50YXRp b24gbG9naWMgaW50byBUZXh0RWRpdG9yTW9kZWwKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTg0MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qcwppbmRleCBlYTlkODJh Y2U0MTIzYmU3ZTBmNGE0Mzg2MzNhNTk2NmI1NDMyNWEyLi45MzYzODUyOTNlM2E4NDQ0ZmUzYTVl NDA3N2E4NjQxODI2YzY2ZmYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanMKQEAgLTU2LDE0ICs1NiwxMSBAQCBX ZWJJbnNwZWN0b3IuRGVmYXVsdFRleHRFZGl0b3IgPSBmdW5jdGlvbih1cmwsIGRlbGVnYXRlKQog CiAgICAgdGhpcy5fdGV4dE1vZGVsID0gbmV3IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwo KTsKICAgICB0aGlzLl90ZXh0TW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGV4 dEVkaXRvck1vZGVsLkV2ZW50cy5UZXh0Q2hhbmdlZCwgdGhpcy5fdGV4dENoYW5nZWQsIHRoaXMp OwotICAgIHRoaXMuX3RleHRNb2RlbC5yZXNldFVuZG9TdGFjaygpOwogCi0gICAgdmFyIGVudGVy VGV4dENoYW5nZU1vZGUgPSB0aGlzLl9lbnRlckludGVybmFsVGV4dENoYW5nZU1vZGUuYmluZCh0 aGlzKTsKLSAgICB2YXIgZXhpdFRleHRDaGFuZ2VNb2RlID0gdGhpcy5fZXhpdEludGVybmFsVGV4 dENoYW5nZU1vZGUuYmluZCh0aGlzKTsKICAgICB2YXIgc3luY1Njcm9sbExpc3RlbmVyID0gdGhp cy5fc3luY1Njcm9sbC5iaW5kKHRoaXMpOwogICAgIHZhciBzeW5jRGVjb3JhdGlvbnNGb3JMaW5l TGlzdGVuZXIgPSB0aGlzLl9zeW5jRGVjb3JhdGlvbnNGb3JMaW5lLmJpbmQodGhpcyk7CiAgICAg dmFyIHN5bmNMaW5lSGVpZ2h0TGlzdGVuZXIgPSB0aGlzLl9zeW5jTGluZUhlaWdodC5iaW5kKHRo aXMpOwotICAgIHRoaXMuX21haW5QYW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1h aW5QYW5lbCh0aGlzLl9kZWxlZ2F0ZSwgdGhpcy5fdGV4dE1vZGVsLCB1cmwsIHN5bmNTY3JvbGxM aXN0ZW5lciwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyLCBlbnRlclRleHRDaGFuZ2VN b2RlLCBleGl0VGV4dENoYW5nZU1vZGUpOworICAgIHRoaXMuX21haW5QYW5lbCA9IG5ldyBXZWJJ bnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbCh0aGlzLl9kZWxlZ2F0ZSwgdGhpcy5fdGV4dE1v ZGVsLCB1cmwsIHN5bmNTY3JvbGxMaXN0ZW5lciwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3Rl bmVyKTsKICAgICB0aGlzLl9ndXR0ZXJQYW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ckd1dHRlclBhbmVsKHRoaXMuX3RleHRNb2RlbCwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3Rl bmVyLCBzeW5jTGluZUhlaWdodExpc3RlbmVyKTsKIAogICAgIHRoaXMuX21haW5QYW5lbC5lbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuX2hhbmRsZVNjcm9sbENoYW5nZWQu YmluZCh0aGlzKSwgZmFsc2UpOwpAQCAtMTMwLDE0ICsxMjcsNiBAQCBXZWJJbnNwZWN0b3IuRGVm YXVsdFRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBA cmV0dXJuIHtXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsfQotICAgICAqLwotICAgIGdldCB0 ZXh0TW9kZWwoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRNb2RlbDsKLSAgICB9 LAotCi0gICAgLyoqCiAgICAgICogQHJldHVybiB7RWxlbWVudH0KICAgICAgKi8KICAgICBkZWZh dWx0Rm9jdXNlZEVsZW1lbnQ6IGZ1bmN0aW9uKCkKQEAgLTMwNiwxMSArMjk1LDEwIEBAIFdlYklu c3BlY3Rvci5EZWZhdWx0VGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAKICAgICBfdGV4dENoYW5n ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9pbnRlcm5hbFRl eHRDaGFuZ2VNb2RlKQotICAgICAgICAgICAgdGhpcy5fdGV4dE1vZGVsLnJlc2V0VW5kb1N0YWNr KCk7CiAgICAgICAgIHRoaXMuX21haW5QYW5lbC50ZXh0Q2hhbmdlZChldmVudC5kYXRhLm9sZFJh bmdlLCBldmVudC5kYXRhLm5ld1JhbmdlKTsKICAgICAgICAgdGhpcy5fZ3V0dGVyUGFuZWwudGV4 dENoYW5nZWQoZXZlbnQuZGF0YS5vbGRSYW5nZSwgZXZlbnQuZGF0YS5uZXdSYW5nZSk7CiAgICAg ICAgIHRoaXMuX3VwZGF0ZVBhbmVsT2Zmc2V0cygpOworICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5v blRleHRDaGFuZ2VkKGV2ZW50LmRhdGEub2xkUmFuZ2UsIGV2ZW50LmRhdGEubmV3UmFuZ2UpOwog ICAgIH0sCiAKICAgICAvKioKQEAgLTMyMCwyNSArMzA4LDcgQEAgV2ViSW5zcGVjdG9yLkRlZmF1 bHRUZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBlZGl0UmFuZ2U6IGZ1bmN0 aW9uKHJhbmdlLCB0ZXh0KQogICAgIHsKLSAgICAgICAgdGhpcy5fZW50ZXJJbnRlcm5hbFRleHRD aGFuZ2VNb2RlKCk7Ci0gICAgICAgIHZhciBuZXdSYW5nZSA9IHRoaXMuX3RleHRNb2RlbC5lZGl0 UmFuZ2UocmFuZ2UsIHRleHQpOwotICAgICAgICB0aGlzLl9leGl0SW50ZXJuYWxUZXh0Q2hhbmdl TW9kZShyYW5nZSwgbmV3UmFuZ2UpOwotICAgICAgICByZXR1cm4gbmV3UmFuZ2U7Ci0gICAgfSwK LQotICAgIF9lbnRlckludGVybmFsVGV4dENoYW5nZU1vZGU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0g ICAgICAgIHRoaXMuX2ludGVybmFsVGV4dENoYW5nZU1vZGUgPSB0cnVlOwotICAgIH0sCi0KLSAg ICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UZXh0UmFuZ2V9IG9sZFJhbmdlCi0g ICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVGV4dFJhbmdlfSBuZXdSYW5nZQotICAgICAqLwot ICAgIF9leGl0SW50ZXJuYWxUZXh0Q2hhbmdlTW9kZTogZnVuY3Rpb24ob2xkUmFuZ2UsIG5ld1Jh bmdlKQotICAgIHsKLSAgICAgICAgdGhpcy5faW50ZXJuYWxUZXh0Q2hhbmdlTW9kZSA9IGZhbHNl OwotICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5vblRleHRDaGFuZ2VkKG9sZFJhbmdlLCBuZXdSYW5n ZSk7CisgICAgICAgIHJldHVybiB0aGlzLl90ZXh0TW9kZWwuZWRpdFJhbmdlKHJhbmdlLCB0ZXh0 KTsKICAgICB9LAogCiAgICAgX3VwZGF0ZVBhbmVsT2Zmc2V0czogZnVuY3Rpb24oKQpAQCAtNjE2 LDE0ICs1ODYsNiBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbCA9IGZ1bmN0 aW9uKHRleHRNb2RlbCkKIAogV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJv dG90eXBlID0gewogICAgIC8qKgotICAgICAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5UZXh0RWRp dG9yTW9kZWx9Ci0gICAgICovCi0gICAgZ2V0IHRleHRNb2RlbCgpCi0gICAgewotICAgICAgICBy ZXR1cm4gdGhpcy5fdGV4dE1vZGVsOwotICAgIH0sCi0KLSAgICAvKioKICAgICAgKiBAcGFyYW0g e251bWJlcn0gbGluZU51bWJlcgogICAgICAqLwogICAgIHNjcm9sbFRvTGluZTogZnVuY3Rpb24o bGluZU51bWJlcikKQEAgLTEyMzYsMTUgKzExOTgsMTMgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0 b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUgPSB7CiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UZXh0 RWRpdG9yTW9kZWx9IHRleHRNb2RlbAogICogQHBhcmFtIHs/c3RyaW5nfSB1cmwKICAqLwotV2Vi SW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwgPSBmdW5jdGlvbihkZWxlZ2F0ZSwgdGV4dE1v ZGVsLCB1cmwsIHN5bmNTY3JvbGxMaXN0ZW5lciwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3Rl bmVyLCBlbnRlclRleHRDaGFuZ2VNb2RlLCBleGl0VGV4dENoYW5nZU1vZGUpCitXZWJJbnNwZWN0 b3IuVGV4dEVkaXRvck1haW5QYW5lbCA9IGZ1bmN0aW9uKGRlbGVnYXRlLCB0ZXh0TW9kZWwsIHVy bCwgc3luY1Njcm9sbExpc3RlbmVyLCBzeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVuZXIpCiB7 CiAgICAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwuY2FsbCh0aGlzLCB0ZXh0 TW9kZWwpOwogCiAgICAgdGhpcy5fZGVsZWdhdGUgPSBkZWxlZ2F0ZTsKICAgICB0aGlzLl9zeW5j U2Nyb2xsTGlzdGVuZXIgPSBzeW5jU2Nyb2xsTGlzdGVuZXI7CiAgICAgdGhpcy5fc3luY0RlY29y YXRpb25zRm9yTGluZUxpc3RlbmVyID0gc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyOwot ICAgIHRoaXMuX2VudGVyVGV4dENoYW5nZU1vZGUgPSBlbnRlclRleHRDaGFuZ2VNb2RlOwotICAg IHRoaXMuX2V4aXRUZXh0Q2hhbmdlTW9kZSA9IGV4aXRUZXh0Q2hhbmdlTW9kZTsKIAogICAgIHRo aXMuX3VybCA9IHVybDsKICAgICB0aGlzLl9oaWdobGlnaHRlciA9IG5ldyBXZWJJbnNwZWN0b3Iu VGV4dEVkaXRvckhpZ2hsaWdodGVyKHRleHRNb2RlbCwgdGhpcy5faGlnaGxpZ2h0RGF0YVJlYWR5 LmJpbmQodGhpcykpOwpAQCAtMTQyNCwxNyArMTM4NCw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLmJlZ2luVXBkYXRlcygp OwogCi0gICAgICAgIGZ1bmN0aW9uIGJlZm9yZSgpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHRo aXMuX2VudGVyVGV4dENoYW5nZU1vZGUoKTsKLSAgICAgICAgfQotCi0gICAgICAgIGZ1bmN0aW9u IGFmdGVyKG9sZFJhbmdlLCBuZXdSYW5nZSkKLSAgICAgICAgewotICAgICAgICAgICAgdGhpcy5f ZXhpdFRleHRDaGFuZ2VNb2RlKG9sZFJhbmdlLCBuZXdSYW5nZSk7Ci0gICAgICAgIH0KLQotICAg ICAgICB2YXIgcmFuZ2UgPSByZWRvID8gdGhpcy5fdGV4dE1vZGVsLnJlZG8oYmVmb3JlLmJpbmQo dGhpcyksIGFmdGVyLmJpbmQodGhpcykpIDogdGhpcy5fdGV4dE1vZGVsLnVuZG8oYmVmb3JlLmJp bmQodGhpcyksIGFmdGVyLmJpbmQodGhpcykpOworICAgICAgICB2YXIgcmFuZ2UgPSByZWRvID8g dGhpcy5fdGV4dE1vZGVsLnJlZG8oKSA6IHRoaXMuX3RleHRNb2RlbC51bmRvKCk7CiAKICAgICAg ICAgdGhpcy5lbmRVcGRhdGVzKCk7CiAKQEAgLTE0NjMsNyArMTQxMyw2IEBAIFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHJhbmdlID0g c2VsZWN0aW9uLm5vcm1hbGl6ZSgpOwogCiAgICAgICAgIHRoaXMuYmVnaW5VcGRhdGVzKCk7Ci0g ICAgICAgIHRoaXMuX2VudGVyVGV4dENoYW5nZU1vZGUoKTsKIAogICAgICAgICB2YXIgbmV3UmFu Z2U7CiAgICAgICAgIHZhciByYW5nZVdhc0VtcHR5ID0gcmFuZ2UuaXNFbXB0eSgpOwpAQCAtMTQ3 Niw3ICsxNDI1LDYgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICAgICAgICAgIG5ld1JhbmdlID0gdGhpcy5fdGV4dE1vZGVsLmluZGVudExp bmVzKHJhbmdlKTsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX2V4aXRUZXh0Q2hhbmdlTW9k ZShyYW5nZSwgbmV3UmFuZ2UpOwogICAgICAgICB0aGlzLmVuZFVwZGF0ZXMoKTsKICAgICAgICAg aWYgKHJhbmdlV2FzRW1wdHkpCiAgICAgICAgICAgICBuZXdSYW5nZS5zdGFydENvbHVtbiA9IG5l d1JhbmdlLmVuZENvbHVtbjsKQEAgLTE1MTMsNyArMTQ2MSw2IEBAIFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgICAgICB0aGlzLmJlZ2luVXBkYXRlcygpOwotICAgICAgICB0aGlzLl9lbnRlclRleHRD aGFuZ2VNb2RlKCk7CiAKICAgICAgICAgdmFyIGxpbmVCcmVhayA9IHRoaXMuX3RleHRNb2RlbC5s aW5lQnJlYWs7CiAgICAgICAgIHZhciBuZXdSYW5nZTsKQEAgLTE1MjksNyArMTQ3Niw2IEBAIFdl Ykluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfSBl bHNlCiAgICAgICAgICAgICBuZXdSYW5nZSA9IHRoaXMuX3RleHRNb2RlbC5lZGl0UmFuZ2UocmFu Z2UsIGxpbmVCcmVhayArIGluZGVudCk7CiAKLSAgICAgICAgdGhpcy5fZXhpdFRleHRDaGFuZ2VN b2RlKHJhbmdlLCBuZXdSYW5nZSk7CiAgICAgICAgIHRoaXMuZW5kVXBkYXRlcygpOwogICAgICAg ICB0aGlzLl9yZXN0b3JlU2VsZWN0aW9uKG5ld1JhbmdlLmNvbGxhcHNlVG9FbmQoKSwgdHJ1ZSk7 CiAKQEAgLTIxODUsMTcgKzIxMzEsMTAgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFu ZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAobGluZXMubGVuZ3RoID09PSAxICYmIGxpbmVz WzBdID09PSAifSIgJiYgb2xkUmFuZ2UuaXNFbXB0eSgpICYmIHNlbGVjdGlvbi5pc0VtcHR5KCkg JiYgIXRoaXMuX3RleHRNb2RlbC5saW5lKG9sZFJhbmdlLmVuZExpbmUpLnRyaW0oKSkKICAgICAg ICAgICAgIHRoaXMuX3VuaW5kZW50QWZ0ZXJCbG9jayhvbGRSYW5nZSwgc2VsZWN0aW9uKTsKICAg ICAgICAgCi0gICAgICAgIC8vIFRoaXMgaXMgYSAiZm9yZWlnbiIgY2FsbCBvdXRzaWRlIG9mIHRo aXMgY2xhc3MuIFNob3VsZCBiZSBiZWZvcmUgd2UgZGVsZXRlIHRoZSBkaXJ0eSBsaW5lcyBmbGFn LgotICAgICAgICB0aGlzLl9lbnRlclRleHRDaGFuZ2VNb2RlKCk7Ci0KICAgICAgICAgZGVsZXRl IHRoaXMuX2RpcnR5TGluZXM7Ci0KICAgICAgICAgdmFyIG5ld1JhbmdlID0gdGhpcy5fdGV4dE1v ZGVsLmVkaXRSYW5nZShvbGRSYW5nZSwgbmV3Q29udGVudCk7Ci0KICAgICAgICAgdGhpcy5fcGFp bnRTY2hlZHVsZWRMaW5lcyh0cnVlKTsKICAgICAgICAgdGhpcy5fcmVzdG9yZVNlbGVjdGlvbihz ZWxlY3Rpb24pOwotCi0gICAgICAgIHRoaXMuX2V4aXRUZXh0Q2hhbmdlTW9kZShvbGRSYW5nZSwg bmV3UmFuZ2UpOwogICAgIH0sCiAKICAgICAvKioKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dEVkaXRvck1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9yTW9kZWwuanMKaW5kZXggZDhhYzJiZDNkMGRm MzU3NDkxODYyMDNiMTA2MTE1ZjIyNjM3ODI3NC4uMDBmZmE0YTRkODIyMjE4NDAwMDZjYzdmZDE1 NjE4NDFhNmMwMTNkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UZXh0RWRpdG9yTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UZXh0RWRpdG9yTW9kZWwuanMKQEAgLTIyNSw2ICsyMjUsNyBAQCBXZWJJbnNwZWN0 b3IuVGV4dEVkaXRvck1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBzZXRUZXh0OiBm dW5jdGlvbih0ZXh0KQogICAgIHsKKyAgICAgICAgdGhpcy5fcmVzZXRVbmRvU3RhY2soKTsKICAg ICAgICAgdGV4dCA9IHRleHQgfHwgIiI7CiAgICAgICAgIHZhciByYW5nZSA9IHRoaXMucmFuZ2Uo KTsKICAgICAgICAgdGhpcy5fbGluZUJyZWFrID0gL1xyXG4vLnRlc3QodGV4dCkgPyAiXHJcbiIg OiAiXG4iOwpAQCAtNDYzLDExICs0NjQsOSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVs LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtmdW5jdGlv bigpPX0gYmVmb3JlQ2FsbGJhY2sKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rv ci5UZXh0UmFuZ2UsIFdlYkluc3BlY3Rvci5UZXh0UmFuZ2UpPX0gYWZ0ZXJDYWxsYmFjawogICAg ICAqIEByZXR1cm4gez9XZWJJbnNwZWN0b3IuVGV4dFJhbmdlfQogICAgICAqLwotICAgIHVuZG86 IGZ1bmN0aW9uKGJlZm9yZUNhbGxiYWNrLCBhZnRlckNhbGxiYWNrKQorICAgIHVuZG86IGZ1bmN0 aW9uKCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fdW5kb1N0YWNrLmxlbmd0aCkKICAgICAg ICAgICAgIHJldHVybiBudWxsOwpAQCAtNDc1LDI1ICs0NzQsMjMgQEAgV2ViSW5zcGVjdG9yLlRl eHRFZGl0b3JNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX21hcmtSZWRvYWJsZVN0 YXRlKCk7CiAKICAgICAgICAgdGhpcy5faW5VbmRvID0gdHJ1ZTsKLSAgICAgICAgdmFyIHJhbmdl ID0gdGhpcy5fZG9VbmRvKHRoaXMuX3VuZG9TdGFjaywgYmVmb3JlQ2FsbGJhY2ssIGFmdGVyQ2Fs bGJhY2spOworICAgICAgICB2YXIgcmFuZ2UgPSB0aGlzLl9kb1VuZG8odGhpcy5fdW5kb1N0YWNr KTsKICAgICAgICAgZGVsZXRlIHRoaXMuX2luVW5kbzsKIAogICAgICAgICByZXR1cm4gcmFuZ2U7 CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oKT19IGJlZm9yZUNh bGxiYWNrCi0gICAgICogQHBhcmFtIHtmdW5jdGlvbihXZWJJbnNwZWN0b3IuVGV4dFJhbmdlLCBX ZWJJbnNwZWN0b3IuVGV4dFJhbmdlKT19IGFmdGVyQ2FsbGJhY2sKICAgICAgKiBAcmV0dXJuIHtX ZWJJbnNwZWN0b3IuVGV4dFJhbmdlfQogICAgICAqLwotICAgIHJlZG86IGZ1bmN0aW9uKGJlZm9y ZUNhbGxiYWNrLCBhZnRlckNhbGxiYWNrKQorICAgIHJlZG86IGZ1bmN0aW9uKCkKICAgICB7CiAg ICAgICAgIGlmICghdGhpcy5fcmVkb1N0YWNrIHx8ICF0aGlzLl9yZWRvU3RhY2subGVuZ3RoKQog ICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgICAgIHRoaXMuX21hcmtVbmRvYWJsZVN0YXRl KCk7CiAKICAgICAgICAgdGhpcy5faW5SZWRvID0gdHJ1ZTsKLSAgICAgICAgdmFyIHJhbmdlID0g dGhpcy5fZG9VbmRvKHRoaXMuX3JlZG9TdGFjaywgYmVmb3JlQ2FsbGJhY2ssIGFmdGVyQ2FsbGJh Y2spOworICAgICAgICB2YXIgcmFuZ2UgPSB0aGlzLl9kb1VuZG8odGhpcy5fcmVkb1N0YWNrKTsK ICAgICAgICAgZGVsZXRlIHRoaXMuX2luUmVkbzsKIAogICAgICAgICByZXR1cm4gcmFuZ2U7CkBA IC01MDEsMjUgKzQ5OCwxNSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsLnByb3RvdHlw ZSA9IHsKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yQ29tbWFuZD59IHN0YWNrCi0gICAgICogQHBhcmFtIHtmdW5jdGlvbigpPX0gYmVmb3Jl Q2FsbGJhY2sKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5UZXh0UmFuZ2Us IFdlYkluc3BlY3Rvci5UZXh0UmFuZ2UpPX0gYWZ0ZXJDYWxsYmFjawogICAgICAqIEByZXR1cm4g e1dlYkluc3BlY3Rvci5UZXh0UmFuZ2V9CiAgICAgICovCi0gICAgX2RvVW5kbzogZnVuY3Rpb24o c3RhY2ssIGJlZm9yZUNhbGxiYWNrLCBhZnRlckNhbGxiYWNrKQorICAgIF9kb1VuZG86IGZ1bmN0 aW9uKHN0YWNrKQogICAgIHsKICAgICAgICAgdmFyIHJhbmdlID0gbnVsbDsKICAgICAgICAgZm9y ICh2YXIgaSA9IHN0YWNrLmxlbmd0aCAtIDE7IGkgPj0gMDsgLS1pKSB7CiAgICAgICAgICAgICB2 YXIgY29tbWFuZCA9IHN0YWNrW2ldOwogICAgICAgICAgICAgc3RhY2subGVuZ3RoID0gaTsKLQot ICAgICAgICAgICAgaWYgKGJlZm9yZUNhbGxiYWNrKQotICAgICAgICAgICAgICAgIGJlZm9yZUNh bGxiYWNrKCk7Ci0KICAgICAgICAgICAgIHJhbmdlID0gdGhpcy5faW5uZXJFZGl0UmFuZ2UoY29t bWFuZC5uZXdSYW5nZSwgY29tbWFuZC5vcmlnaW5hbFRleHQpOwotCi0gICAgICAgICAgICBpZiAo YWZ0ZXJDYWxsYmFjaykKLSAgICAgICAgICAgICAgICBhZnRlckNhbGxiYWNrKGNvbW1hbmQubmV3 UmFuZ2UsIHJhbmdlKTsKLQogICAgICAgICAgICAgaWYgKGkgPiAwICYmIHN0YWNrW2kgLSAxXS5l eHBsaWNpdCkKICAgICAgICAgICAgICAgICByZXR1cm4gcmFuZ2U7CiAgICAgICAgIH0KQEAgLTUz OCw3ICs1MjUsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIHRoaXMuX3JlZG9TdGFja1t0aGlzLl9yZWRvU3RhY2subGVuZ3RoIC0gMV0u ZXhwbGljaXQgPSB0cnVlOwogICAgIH0sCiAKLSAgICByZXNldFVuZG9TdGFjazogZnVuY3Rpb24o KQorICAgIF9yZXNldFVuZG9TdGFjazogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5f dW5kb1N0YWNrID0gW107CiAgICAgfSwK 173490 2012-11-10 23:38:50 -0800 2012-11-11 06:11:46 -0800 [Patch] rebaselined bug-101845-20121111113653.patch text/plain 11324 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGI2ZWIyZTRmYjFkZDQ3 NzdlNjlhYWNhYTFjYTYzZWMxNTU2NTg4MS4uMGRiZjM0NjBiODEwZmNkYzhlMDBmMGE1OGY5Y2I4 ZDU0MTJlNzQ2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEyLTExLTEwICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGdldCByaWQgb2YgZW50ZXIvZXhpdFRleHRDaGFuZ2VNb2RlIGluIHRoZSBlZGl0b3IKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTg0NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXkgc2VlbSB0 byBkbyBub3RoaW5nLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4 dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWZhdWx0VGV4dEVkaXRvci5wcm90 b3R5cGUuX3RleHRDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWZhdWx0VGV4dEVk aXRvci5wcm90b3R5cGUuZWRpdFJhbmdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpblBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVs LnByb3RvdHlwZS5oYW5kbGVVbmRvUmVkbyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVk aXRvck1haW5QYW5lbC5wcm90b3R5cGUuaGFuZGxlRW50ZXJLZXkuZ2V0IHZhcik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuaGFuZGxlRW50ZXJL ZXkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBl Ll9hcHBseURvbVVwZGF0ZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dEVk aXRvck1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNb2RlbC5lbmRz V2l0aEJyYWNrZXRSZWdleC4pOgorCisyMDEyLTExLTEwICBQYXZlbCBGZWxkbWFuICA8cGZlbGRt YW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1vdmUgaW5kZW50YXRp b24gbG9naWMgaW50byBUZXh0RWRpdG9yTW9kZWwKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTg0MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qcwppbmRleCA2YWY2NWEz YTJjZWZmMGM5OTFmNDk0YjliNGZjNTFjOGY3ZjZlZjA0Li44ZmMzMDU3N2E0MTMxOTMwMzM1YzU2 MGY2OGUyMmMwNmZlMTk5ZGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanMKQEAgLTU2LDE0ICs1NiwxMSBAQCBX ZWJJbnNwZWN0b3IuRGVmYXVsdFRleHRFZGl0b3IgPSBmdW5jdGlvbih1cmwsIGRlbGVnYXRlKQog CiAgICAgdGhpcy5fdGV4dE1vZGVsID0gbmV3IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwo KTsKICAgICB0aGlzLl90ZXh0TW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGV4 dEVkaXRvck1vZGVsLkV2ZW50cy5UZXh0Q2hhbmdlZCwgdGhpcy5fdGV4dENoYW5nZWQsIHRoaXMp OwotICAgIHRoaXMuX3RleHRNb2RlbC5yZXNldFVuZG9TdGFjaygpOwogCi0gICAgdmFyIGVudGVy VGV4dENoYW5nZU1vZGUgPSB0aGlzLl9lbnRlckludGVybmFsVGV4dENoYW5nZU1vZGUuYmluZCh0 aGlzKTsKLSAgICB2YXIgZXhpdFRleHRDaGFuZ2VNb2RlID0gdGhpcy5fZXhpdEludGVybmFsVGV4 dENoYW5nZU1vZGUuYmluZCh0aGlzKTsKICAgICB2YXIgc3luY1Njcm9sbExpc3RlbmVyID0gdGhp cy5fc3luY1Njcm9sbC5iaW5kKHRoaXMpOwogICAgIHZhciBzeW5jRGVjb3JhdGlvbnNGb3JMaW5l TGlzdGVuZXIgPSB0aGlzLl9zeW5jRGVjb3JhdGlvbnNGb3JMaW5lLmJpbmQodGhpcyk7CiAgICAg dmFyIHN5bmNMaW5lSGVpZ2h0TGlzdGVuZXIgPSB0aGlzLl9zeW5jTGluZUhlaWdodC5iaW5kKHRo aXMpOwotICAgIHRoaXMuX21haW5QYW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1h aW5QYW5lbCh0aGlzLl9kZWxlZ2F0ZSwgdGhpcy5fdGV4dE1vZGVsLCB1cmwsIHN5bmNTY3JvbGxM aXN0ZW5lciwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyLCBlbnRlclRleHRDaGFuZ2VN b2RlLCBleGl0VGV4dENoYW5nZU1vZGUpOworICAgIHRoaXMuX21haW5QYW5lbCA9IG5ldyBXZWJJ bnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbCh0aGlzLl9kZWxlZ2F0ZSwgdGhpcy5fdGV4dE1v ZGVsLCB1cmwsIHN5bmNTY3JvbGxMaXN0ZW5lciwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3Rl bmVyKTsKICAgICB0aGlzLl9ndXR0ZXJQYW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ckd1dHRlclBhbmVsKHRoaXMuX3RleHRNb2RlbCwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3Rl bmVyLCBzeW5jTGluZUhlaWdodExpc3RlbmVyKTsKIAogICAgIHRoaXMuX21haW5QYW5lbC5lbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuX2hhbmRsZVNjcm9sbENoYW5nZWQu YmluZCh0aGlzKSwgZmFsc2UpOwpAQCAtMTMwLDE0ICsxMjcsNiBAQCBXZWJJbnNwZWN0b3IuRGVm YXVsdFRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBA cmV0dXJuIHtXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsfQotICAgICAqLwotICAgIGdldCB0 ZXh0TW9kZWwoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRNb2RlbDsKLSAgICB9 LAotCi0gICAgLyoqCiAgICAgICogQHJldHVybiB7RWxlbWVudH0KICAgICAgKi8KICAgICBkZWZh dWx0Rm9jdXNlZEVsZW1lbnQ6IGZ1bmN0aW9uKCkKQEAgLTMwNiwxMSArMjk1LDEwIEBAIFdlYklu c3BlY3Rvci5EZWZhdWx0VGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAKICAgICBfdGV4dENoYW5n ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9pbnRlcm5hbFRl eHRDaGFuZ2VNb2RlKQotICAgICAgICAgICAgdGhpcy5fdGV4dE1vZGVsLnJlc2V0VW5kb1N0YWNr KCk7CiAgICAgICAgIHRoaXMuX21haW5QYW5lbC50ZXh0Q2hhbmdlZChldmVudC5kYXRhLm9sZFJh bmdlLCBldmVudC5kYXRhLm5ld1JhbmdlKTsKICAgICAgICAgdGhpcy5fZ3V0dGVyUGFuZWwudGV4 dENoYW5nZWQoZXZlbnQuZGF0YS5vbGRSYW5nZSwgZXZlbnQuZGF0YS5uZXdSYW5nZSk7CiAgICAg ICAgIHRoaXMuX3VwZGF0ZVBhbmVsT2Zmc2V0cygpOworICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5v blRleHRDaGFuZ2VkKGV2ZW50LmRhdGEub2xkUmFuZ2UsIGV2ZW50LmRhdGEubmV3UmFuZ2UpOwog ICAgIH0sCiAKICAgICAvKioKQEAgLTMyMCwyNSArMzA4LDcgQEAgV2ViSW5zcGVjdG9yLkRlZmF1 bHRUZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBlZGl0UmFuZ2U6IGZ1bmN0 aW9uKHJhbmdlLCB0ZXh0KQogICAgIHsKLSAgICAgICAgdGhpcy5fZW50ZXJJbnRlcm5hbFRleHRD aGFuZ2VNb2RlKCk7Ci0gICAgICAgIHZhciBuZXdSYW5nZSA9IHRoaXMuX3RleHRNb2RlbC5lZGl0 UmFuZ2UocmFuZ2UsIHRleHQpOwotICAgICAgICB0aGlzLl9leGl0SW50ZXJuYWxUZXh0Q2hhbmdl TW9kZShyYW5nZSwgbmV3UmFuZ2UpOwotICAgICAgICByZXR1cm4gbmV3UmFuZ2U7Ci0gICAgfSwK LQotICAgIF9lbnRlckludGVybmFsVGV4dENoYW5nZU1vZGU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0g ICAgICAgIHRoaXMuX2ludGVybmFsVGV4dENoYW5nZU1vZGUgPSB0cnVlOwotICAgIH0sCi0KLSAg ICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UZXh0UmFuZ2V9IG9sZFJhbmdlCi0g ICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVGV4dFJhbmdlfSBuZXdSYW5nZQotICAgICAqLwot ICAgIF9leGl0SW50ZXJuYWxUZXh0Q2hhbmdlTW9kZTogZnVuY3Rpb24ob2xkUmFuZ2UsIG5ld1Jh bmdlKQotICAgIHsKLSAgICAgICAgdGhpcy5faW50ZXJuYWxUZXh0Q2hhbmdlTW9kZSA9IGZhbHNl OwotICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5vblRleHRDaGFuZ2VkKG9sZFJhbmdlLCBuZXdSYW5n ZSk7CisgICAgICAgIHJldHVybiB0aGlzLl90ZXh0TW9kZWwuZWRpdFJhbmdlKHJhbmdlLCB0ZXh0 KTsKICAgICB9LAogCiAgICAgX3VwZGF0ZVBhbmVsT2Zmc2V0czogZnVuY3Rpb24oKQpAQCAtNjE2 LDE0ICs1ODYsNiBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbCA9IGZ1bmN0 aW9uKHRleHRNb2RlbCkKIAogV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJv dG90eXBlID0gewogICAgIC8qKgotICAgICAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5UZXh0RWRp dG9yTW9kZWx9Ci0gICAgICovCi0gICAgZ2V0IHRleHRNb2RlbCgpCi0gICAgewotICAgICAgICBy ZXR1cm4gdGhpcy5fdGV4dE1vZGVsOwotICAgIH0sCi0KLSAgICAvKioKICAgICAgKiBAcGFyYW0g e251bWJlcn0gbGluZU51bWJlcgogICAgICAqLwogICAgIHNjcm9sbFRvTGluZTogZnVuY3Rpb24o bGluZU51bWJlcikKQEAgLTEyMzYsMTUgKzExOTgsMTMgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0 b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUgPSB7CiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UZXh0 RWRpdG9yTW9kZWx9IHRleHRNb2RlbAogICogQHBhcmFtIHs/c3RyaW5nfSB1cmwKICAqLwotV2Vi SW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwgPSBmdW5jdGlvbihkZWxlZ2F0ZSwgdGV4dE1v ZGVsLCB1cmwsIHN5bmNTY3JvbGxMaXN0ZW5lciwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3Rl bmVyLCBlbnRlclRleHRDaGFuZ2VNb2RlLCBleGl0VGV4dENoYW5nZU1vZGUpCitXZWJJbnNwZWN0 b3IuVGV4dEVkaXRvck1haW5QYW5lbCA9IGZ1bmN0aW9uKGRlbGVnYXRlLCB0ZXh0TW9kZWwsIHVy bCwgc3luY1Njcm9sbExpc3RlbmVyLCBzeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVuZXIpCiB7 CiAgICAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwuY2FsbCh0aGlzLCB0ZXh0 TW9kZWwpOwogCiAgICAgdGhpcy5fZGVsZWdhdGUgPSBkZWxlZ2F0ZTsKICAgICB0aGlzLl9zeW5j U2Nyb2xsTGlzdGVuZXIgPSBzeW5jU2Nyb2xsTGlzdGVuZXI7CiAgICAgdGhpcy5fc3luY0RlY29y YXRpb25zRm9yTGluZUxpc3RlbmVyID0gc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyOwot ICAgIHRoaXMuX2VudGVyVGV4dENoYW5nZU1vZGUgPSBlbnRlclRleHRDaGFuZ2VNb2RlOwotICAg IHRoaXMuX2V4aXRUZXh0Q2hhbmdlTW9kZSA9IGV4aXRUZXh0Q2hhbmdlTW9kZTsKIAogICAgIHRo aXMuX3VybCA9IHVybDsKICAgICB0aGlzLl9oaWdobGlnaHRlciA9IG5ldyBXZWJJbnNwZWN0b3Iu VGV4dEVkaXRvckhpZ2hsaWdodGVyKHRleHRNb2RlbCwgdGhpcy5faGlnaGxpZ2h0RGF0YVJlYWR5 LmJpbmQodGhpcykpOwpAQCAtMTQxNCwxNyArMTM3NCw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLmJlZ2luVXBkYXRlcygp OwogCi0gICAgICAgIGZ1bmN0aW9uIGJlZm9yZSgpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHRo aXMuX2VudGVyVGV4dENoYW5nZU1vZGUoKTsKLSAgICAgICAgfQotCi0gICAgICAgIGZ1bmN0aW9u IGFmdGVyKG9sZFJhbmdlLCBuZXdSYW5nZSkKLSAgICAgICAgewotICAgICAgICAgICAgdGhpcy5f ZXhpdFRleHRDaGFuZ2VNb2RlKG9sZFJhbmdlLCBuZXdSYW5nZSk7Ci0gICAgICAgIH0KLQotICAg ICAgICB2YXIgcmFuZ2UgPSByZWRvID8gdGhpcy5fdGV4dE1vZGVsLnJlZG8oYmVmb3JlLmJpbmQo dGhpcyksIGFmdGVyLmJpbmQodGhpcykpIDogdGhpcy5fdGV4dE1vZGVsLnVuZG8oYmVmb3JlLmJp bmQodGhpcyksIGFmdGVyLmJpbmQodGhpcykpOworICAgICAgICB2YXIgcmFuZ2UgPSByZWRvID8g dGhpcy5fdGV4dE1vZGVsLnJlZG8oKSA6IHRoaXMuX3RleHRNb2RlbC51bmRvKCk7CiAKICAgICAg ICAgdGhpcy5lbmRVcGRhdGVzKCk7CiAKQEAgLTE0NTAsNyArMTQwMCw2IEBAIFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHJhbmdlID0g c2VsZWN0aW9uLm5vcm1hbGl6ZSgpOwogCiAgICAgICAgIHRoaXMuYmVnaW5VcGRhdGVzKCk7Ci0g ICAgICAgIHRoaXMuX2VudGVyVGV4dENoYW5nZU1vZGUoKTsKIAogICAgICAgICB2YXIgbmV3UmFu Z2U7CiAgICAgICAgIHZhciByYW5nZVdhc0VtcHR5ID0gcmFuZ2UuaXNFbXB0eSgpOwpAQCAtMTQ2 Myw3ICsxNDEyLDYgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICAgICAgICAgIG5ld1JhbmdlID0gdGhpcy5fdGV4dE1vZGVsLmluZGVudExp bmVzKHJhbmdlKTsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX2V4aXRUZXh0Q2hhbmdlTW9k ZShyYW5nZSwgbmV3UmFuZ2UpOwogICAgICAgICB0aGlzLmVuZFVwZGF0ZXMoKTsKICAgICAgICAg aWYgKHJhbmdlV2FzRW1wdHkpCiAgICAgICAgICAgICBuZXdSYW5nZS5zdGFydENvbHVtbiA9IG5l d1JhbmdlLmVuZENvbHVtbjsKQEAgLTE0OTcsNyArMTQ0NSw2IEBAIFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgICAgICB0aGlzLmJlZ2luVXBkYXRlcygpOwotICAgICAgICB0aGlzLl9lbnRlclRleHRD aGFuZ2VNb2RlKCk7CiAKICAgICAgICAgdmFyIGxpbmVCcmVhayA9IHRoaXMuX3RleHRNb2RlbC5s aW5lQnJlYWs7CiAgICAgICAgIHZhciBuZXdSYW5nZTsKQEAgLTE1MTMsNyArMTQ2MCw2IEBAIFdl Ykluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfSBl bHNlCiAgICAgICAgICAgICBuZXdSYW5nZSA9IHRoaXMuX3RleHRNb2RlbC5lZGl0UmFuZ2UocmFu Z2UsIGxpbmVCcmVhayArIGluZGVudCk7CiAKLSAgICAgICAgdGhpcy5fZXhpdFRleHRDaGFuZ2VN b2RlKHJhbmdlLCBuZXdSYW5nZSk7CiAgICAgICAgIHRoaXMuZW5kVXBkYXRlcygpOwogICAgICAg ICB0aGlzLl9yZXN0b3JlU2VsZWN0aW9uKG5ld1JhbmdlLmNvbGxhcHNlVG9FbmQoKSwgdHJ1ZSk7 CiAKQEAgLTIxNjcsMTYgKzIxMTMsOSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5l bC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgaWYgKGxpbmVzLmxlbmd0aCA9PT0gMSAmJiBsaW5l c1swXSA9PT0gIn0iICYmIG9sZFJhbmdlLmlzRW1wdHkoKSAmJiBzZWxlY3Rpb24uaXNFbXB0eSgp ICYmICF0aGlzLl90ZXh0TW9kZWwubGluZShvbGRSYW5nZS5lbmRMaW5lKS50cmltKCkpCiAgICAg ICAgICAgICB0aGlzLl91bmluZGVudEFmdGVyQmxvY2sob2xkUmFuZ2UsIHNlbGVjdGlvbik7Ci0K LSAgICAgICAgLy8gVGhpcyBpcyBhICJmb3JlaWduIiBjYWxsIG91dHNpZGUgb2YgdGhpcyBjbGFz cy4gU2hvdWxkIGJlIGJlZm9yZSB3ZSBkZWxldGUgdGhlIGRpcnR5IGxpbmVzIGZsYWcuCi0gICAg ICAgIHRoaXMuX2VudGVyVGV4dENoYW5nZU1vZGUoKTsKLQogICAgICAgICB2YXIgbmV3UmFuZ2Ug PSB0aGlzLl90ZXh0TW9kZWwuZWRpdFJhbmdlKG9sZFJhbmdlLCBuZXdDb250ZW50KTsKLQogICAg ICAgICB0aGlzLl9wYWludFNjaGVkdWxlZExpbmVzKHRydWUpOwogICAgICAgICB0aGlzLl9yZXN0 b3JlU2VsZWN0aW9uKHNlbGVjdGlvbik7Ci0KLSAgICAgICAgdGhpcy5fZXhpdFRleHRDaGFuZ2VN b2RlKG9sZFJhbmdlLCBuZXdSYW5nZSk7CiAgICAgfSwKIAogICAgIC8qKgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9yTW9kZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcwppbmRl eCBkOGFjMmJkM2QwZGYzNTc0OTE4NjIwM2IxMDYxMTVmMjI2Mzc4Mjc0Li4wMGZmYTRhNGQ4MjIy MTg0MDAwNmNjN2ZkMTU2MTg0MWE2YzAxM2RiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcwpAQCAtMjI1LDYgKzIyNSw3 IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwucHJvdG90eXBlID0gewogICAgICAqLwog ICAgIHNldFRleHQ6IGZ1bmN0aW9uKHRleHQpCiAgICAgeworICAgICAgICB0aGlzLl9yZXNldFVu ZG9TdGFjaygpOwogICAgICAgICB0ZXh0ID0gdGV4dCB8fCAiIjsKICAgICAgICAgdmFyIHJhbmdl ID0gdGhpcy5yYW5nZSgpOwogICAgICAgICB0aGlzLl9saW5lQnJlYWsgPSAvXHJcbi8udGVzdCh0 ZXh0KSA/ICJcclxuIiA6ICJcbiI7CkBAIC00NjMsMTEgKzQ2NCw5IEBAIFdlYkluc3BlY3Rvci5U ZXh0RWRpdG9yTW9kZWwucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBA cGFyYW0ge2Z1bmN0aW9uKCk9fSBiZWZvcmVDYWxsYmFjawotICAgICAqIEBwYXJhbSB7ZnVuY3Rp b24oV2ViSW5zcGVjdG9yLlRleHRSYW5nZSwgV2ViSW5zcGVjdG9yLlRleHRSYW5nZSk9fSBhZnRl ckNhbGxiYWNrCiAgICAgICogQHJldHVybiB7P1dlYkluc3BlY3Rvci5UZXh0UmFuZ2V9CiAgICAg ICovCi0gICAgdW5kbzogZnVuY3Rpb24oYmVmb3JlQ2FsbGJhY2ssIGFmdGVyQ2FsbGJhY2spCisg ICAgdW5kbzogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl91bmRvU3RhY2su bGVuZ3RoKQogICAgICAgICAgICAgcmV0dXJuIG51bGw7CkBAIC00NzUsMjUgKzQ3NCwyMyBAQCBX ZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5f bWFya1JlZG9hYmxlU3RhdGUoKTsKIAogICAgICAgICB0aGlzLl9pblVuZG8gPSB0cnVlOwotICAg ICAgICB2YXIgcmFuZ2UgPSB0aGlzLl9kb1VuZG8odGhpcy5fdW5kb1N0YWNrLCBiZWZvcmVDYWxs YmFjaywgYWZ0ZXJDYWxsYmFjayk7CisgICAgICAgIHZhciByYW5nZSA9IHRoaXMuX2RvVW5kbyh0 aGlzLl91bmRvU3RhY2spOwogICAgICAgICBkZWxldGUgdGhpcy5faW5VbmRvOwogCiAgICAgICAg IHJldHVybiByYW5nZTsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtmdW5jdGlv bigpPX0gYmVmb3JlQ2FsbGJhY2sKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rv ci5UZXh0UmFuZ2UsIFdlYkluc3BlY3Rvci5UZXh0UmFuZ2UpPX0gYWZ0ZXJDYWxsYmFjawogICAg ICAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5UZXh0UmFuZ2V9CiAgICAgICovCi0gICAgcmVkbzog ZnVuY3Rpb24oYmVmb3JlQ2FsbGJhY2ssIGFmdGVyQ2FsbGJhY2spCisgICAgcmVkbzogZnVuY3Rp b24oKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9yZWRvU3RhY2sgfHwgIXRoaXMuX3JlZG9T dGFjay5sZW5ndGgpCiAgICAgICAgICAgICByZXR1cm4gbnVsbDsKICAgICAgICAgdGhpcy5fbWFy a1VuZG9hYmxlU3RhdGUoKTsKIAogICAgICAgICB0aGlzLl9pblJlZG8gPSB0cnVlOwotICAgICAg ICB2YXIgcmFuZ2UgPSB0aGlzLl9kb1VuZG8odGhpcy5fcmVkb1N0YWNrLCBiZWZvcmVDYWxsYmFj aywgYWZ0ZXJDYWxsYmFjayk7CisgICAgICAgIHZhciByYW5nZSA9IHRoaXMuX2RvVW5kbyh0aGlz Ll9yZWRvU3RhY2spOwogICAgICAgICBkZWxldGUgdGhpcy5faW5SZWRvOwogCiAgICAgICAgIHJl dHVybiByYW5nZTsKQEAgLTUwMSwyNSArNDk4LDE1IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TW9kZWwucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtBcnJheS48V2Vi SW5zcGVjdG9yLlRleHRFZGl0b3JDb21tYW5kPn0gc3RhY2sKLSAgICAgKiBAcGFyYW0ge2Z1bmN0 aW9uKCk9fSBiZWZvcmVDYWxsYmFjawotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5zcGVj dG9yLlRleHRSYW5nZSwgV2ViSW5zcGVjdG9yLlRleHRSYW5nZSk9fSBhZnRlckNhbGxiYWNrCiAg ICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlRleHRSYW5nZX0KICAgICAgKi8KLSAgICBfZG9V bmRvOiBmdW5jdGlvbihzdGFjaywgYmVmb3JlQ2FsbGJhY2ssIGFmdGVyQ2FsbGJhY2spCisgICAg X2RvVW5kbzogZnVuY3Rpb24oc3RhY2spCiAgICAgewogICAgICAgICB2YXIgcmFuZ2UgPSBudWxs OwogICAgICAgICBmb3IgKHZhciBpID0gc3RhY2subGVuZ3RoIC0gMTsgaSA+PSAwOyAtLWkpIHsK ICAgICAgICAgICAgIHZhciBjb21tYW5kID0gc3RhY2tbaV07CiAgICAgICAgICAgICBzdGFjay5s ZW5ndGggPSBpOwotCi0gICAgICAgICAgICBpZiAoYmVmb3JlQ2FsbGJhY2spCi0gICAgICAgICAg ICAgICAgYmVmb3JlQ2FsbGJhY2soKTsKLQogICAgICAgICAgICAgcmFuZ2UgPSB0aGlzLl9pbm5l ckVkaXRSYW5nZShjb21tYW5kLm5ld1JhbmdlLCBjb21tYW5kLm9yaWdpbmFsVGV4dCk7Ci0KLSAg ICAgICAgICAgIGlmIChhZnRlckNhbGxiYWNrKQotICAgICAgICAgICAgICAgIGFmdGVyQ2FsbGJh Y2soY29tbWFuZC5uZXdSYW5nZSwgcmFuZ2UpOwotCiAgICAgICAgICAgICBpZiAoaSA+IDAgJiYg c3RhY2tbaSAtIDFdLmV4cGxpY2l0KQogICAgICAgICAgICAgICAgIHJldHVybiByYW5nZTsKICAg ICAgICAgfQpAQCAtNTM4LDcgKzUyNSw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwu cHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fcmVkb1N0YWNrW3RoaXMuX3JlZG9TdGFj ay5sZW5ndGggLSAxXS5leHBsaWNpdCA9IHRydWU7CiAgICAgfSwKIAotICAgIHJlc2V0VW5kb1N0 YWNrOiBmdW5jdGlvbigpCisgICAgX3Jlc2V0VW5kb1N0YWNrOiBmdW5jdGlvbigpCiAgICAgewog ICAgICAgICB0aGlzLl91bmRvU3RhY2sgPSBbXTsKICAgICB9LAo= 173503 2012-11-11 06:11:53 -0800 2012-11-12 00:39:21 -0800 [Patch] rebaselined bug-101845-20121111180955.patch text/plain 11543 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2M0MjJlMzYyNWE0N2Q5 NDE0NzI2NmM0MDQ5MzVlMDE4MjdmZjU3Yy4uMTEwOGE4NWEzOGIwOGRkZmRlZmI3MDYwZDVhMDI3 ZWQ1ZWY0NjY2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEyLTExLTEwICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGdldCByaWQgb2YgZW50ZXIvZXhpdFRleHRDaGFuZ2VNb2RlIGluIHRoZSBlZGl0b3IKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTg0NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXkgc2VlbSB0 byBkbyBub3RoaW5nLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4 dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWZhdWx0VGV4dEVkaXRvci5wcm90 b3R5cGUuX3RleHRDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWZhdWx0VGV4dEVk aXRvci5wcm90b3R5cGUuZWRpdFJhbmdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpblBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVs LnByb3RvdHlwZS5oYW5kbGVVbmRvUmVkbyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVk aXRvck1haW5QYW5lbC5wcm90b3R5cGUuaGFuZGxlRW50ZXJLZXkuZ2V0IHZhcik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuaGFuZGxlRW50ZXJL ZXkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBl Ll9hcHBseURvbVVwZGF0ZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dEVk aXRvck1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNb2RlbC5lbmRz V2l0aEJyYWNrZXRSZWdleC4pOgorCisyMDEyLTExLTEwICBQYXZlbCBGZWxkbWFuICA8cGZlbGRt YW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1vdmUgaW5kZW50YXRp b24gbG9naWMgaW50byBUZXh0RWRpdG9yTW9kZWwKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTg0MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qcwppbmRleCA5MWZjY2Q5 OTBmODI3Njk0ZmFlZGJhMTA5MzllYjNjZmVhYTA4OWY4Li45MjMxMDljYTIwYWFiY2Q3MThjYjYw YzNiNDc5YjU4NjZmOWZjYzBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanMKQEAgLTU2LDE0ICs1NiwxMSBAQCBX ZWJJbnNwZWN0b3IuRGVmYXVsdFRleHRFZGl0b3IgPSBmdW5jdGlvbih1cmwsIGRlbGVnYXRlKQog CiAgICAgdGhpcy5fdGV4dE1vZGVsID0gbmV3IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwo KTsKICAgICB0aGlzLl90ZXh0TW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGV4 dEVkaXRvck1vZGVsLkV2ZW50cy5UZXh0Q2hhbmdlZCwgdGhpcy5fdGV4dENoYW5nZWQsIHRoaXMp OwotICAgIHRoaXMuX3RleHRNb2RlbC5yZXNldFVuZG9TdGFjaygpOwogCi0gICAgdmFyIGVudGVy VGV4dENoYW5nZU1vZGUgPSB0aGlzLl9lbnRlckludGVybmFsVGV4dENoYW5nZU1vZGUuYmluZCh0 aGlzKTsKLSAgICB2YXIgZXhpdFRleHRDaGFuZ2VNb2RlID0gdGhpcy5fZXhpdEludGVybmFsVGV4 dENoYW5nZU1vZGUuYmluZCh0aGlzKTsKICAgICB2YXIgc3luY1Njcm9sbExpc3RlbmVyID0gdGhp cy5fc3luY1Njcm9sbC5iaW5kKHRoaXMpOwogICAgIHZhciBzeW5jRGVjb3JhdGlvbnNGb3JMaW5l TGlzdGVuZXIgPSB0aGlzLl9zeW5jRGVjb3JhdGlvbnNGb3JMaW5lLmJpbmQodGhpcyk7CiAgICAg dmFyIHN5bmNMaW5lSGVpZ2h0TGlzdGVuZXIgPSB0aGlzLl9zeW5jTGluZUhlaWdodC5iaW5kKHRo aXMpOwotICAgIHRoaXMuX21haW5QYW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1h aW5QYW5lbCh0aGlzLl9kZWxlZ2F0ZSwgdGhpcy5fdGV4dE1vZGVsLCB1cmwsIHN5bmNTY3JvbGxM aXN0ZW5lciwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyLCBlbnRlclRleHRDaGFuZ2VN b2RlLCBleGl0VGV4dENoYW5nZU1vZGUpOworICAgIHRoaXMuX21haW5QYW5lbCA9IG5ldyBXZWJJ bnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbCh0aGlzLl9kZWxlZ2F0ZSwgdGhpcy5fdGV4dE1v ZGVsLCB1cmwsIHN5bmNTY3JvbGxMaXN0ZW5lciwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3Rl bmVyKTsKICAgICB0aGlzLl9ndXR0ZXJQYW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ckd1dHRlclBhbmVsKHRoaXMuX3RleHRNb2RlbCwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3Rl bmVyLCBzeW5jTGluZUhlaWdodExpc3RlbmVyKTsKIAogICAgIHRoaXMuX21haW5QYW5lbC5lbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuX2hhbmRsZVNjcm9sbENoYW5nZWQu YmluZCh0aGlzKSwgZmFsc2UpOwpAQCAtMTMwLDE0ICsxMjcsNiBAQCBXZWJJbnNwZWN0b3IuRGVm YXVsdFRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBA cmV0dXJuIHtXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsfQotICAgICAqLwotICAgIGdldCB0 ZXh0TW9kZWwoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRNb2RlbDsKLSAgICB9 LAotCi0gICAgLyoqCiAgICAgICogQHJldHVybiB7RWxlbWVudH0KICAgICAgKi8KICAgICBkZWZh dWx0Rm9jdXNlZEVsZW1lbnQ6IGZ1bmN0aW9uKCkKQEAgLTMwNiwxMSArMjk1LDEwIEBAIFdlYklu c3BlY3Rvci5EZWZhdWx0VGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAKICAgICBfdGV4dENoYW5n ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9pbnRlcm5hbFRl eHRDaGFuZ2VNb2RlKQotICAgICAgICAgICAgdGhpcy5fdGV4dE1vZGVsLnJlc2V0VW5kb1N0YWNr KCk7CiAgICAgICAgIHRoaXMuX21haW5QYW5lbC50ZXh0Q2hhbmdlZChldmVudC5kYXRhLm9sZFJh bmdlLCBldmVudC5kYXRhLm5ld1JhbmdlKTsKICAgICAgICAgdGhpcy5fZ3V0dGVyUGFuZWwudGV4 dENoYW5nZWQoZXZlbnQuZGF0YS5vbGRSYW5nZSwgZXZlbnQuZGF0YS5uZXdSYW5nZSk7CiAgICAg ICAgIHRoaXMuX3VwZGF0ZVBhbmVsT2Zmc2V0cygpOworICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5v blRleHRDaGFuZ2VkKGV2ZW50LmRhdGEub2xkUmFuZ2UsIGV2ZW50LmRhdGEubmV3UmFuZ2UpOwog ICAgIH0sCiAKICAgICAvKioKQEAgLTMyMCwyNSArMzA4LDcgQEAgV2ViSW5zcGVjdG9yLkRlZmF1 bHRUZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBlZGl0UmFuZ2U6IGZ1bmN0 aW9uKHJhbmdlLCB0ZXh0KQogICAgIHsKLSAgICAgICAgdGhpcy5fZW50ZXJJbnRlcm5hbFRleHRD aGFuZ2VNb2RlKCk7Ci0gICAgICAgIHZhciBuZXdSYW5nZSA9IHRoaXMuX3RleHRNb2RlbC5lZGl0 UmFuZ2UocmFuZ2UsIHRleHQpOwotICAgICAgICB0aGlzLl9leGl0SW50ZXJuYWxUZXh0Q2hhbmdl TW9kZShyYW5nZSwgbmV3UmFuZ2UpOwotICAgICAgICByZXR1cm4gbmV3UmFuZ2U7Ci0gICAgfSwK LQotICAgIF9lbnRlckludGVybmFsVGV4dENoYW5nZU1vZGU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0g ICAgICAgIHRoaXMuX2ludGVybmFsVGV4dENoYW5nZU1vZGUgPSB0cnVlOwotICAgIH0sCi0KLSAg ICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UZXh0UmFuZ2V9IG9sZFJhbmdlCi0g ICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVGV4dFJhbmdlfSBuZXdSYW5nZQotICAgICAqLwot ICAgIF9leGl0SW50ZXJuYWxUZXh0Q2hhbmdlTW9kZTogZnVuY3Rpb24ob2xkUmFuZ2UsIG5ld1Jh bmdlKQotICAgIHsKLSAgICAgICAgdGhpcy5faW50ZXJuYWxUZXh0Q2hhbmdlTW9kZSA9IGZhbHNl OwotICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5vblRleHRDaGFuZ2VkKG9sZFJhbmdlLCBuZXdSYW5n ZSk7CisgICAgICAgIHJldHVybiB0aGlzLl90ZXh0TW9kZWwuZWRpdFJhbmdlKHJhbmdlLCB0ZXh0 KTsKICAgICB9LAogCiAgICAgX3VwZGF0ZVBhbmVsT2Zmc2V0czogZnVuY3Rpb24oKQpAQCAtNjE2 LDE0ICs1ODYsNiBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbCA9IGZ1bmN0 aW9uKHRleHRNb2RlbCkKIAogV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJv dG90eXBlID0gewogICAgIC8qKgotICAgICAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5UZXh0RWRp dG9yTW9kZWx9Ci0gICAgICovCi0gICAgZ2V0IHRleHRNb2RlbCgpCi0gICAgewotICAgICAgICBy ZXR1cm4gdGhpcy5fdGV4dE1vZGVsOwotICAgIH0sCi0KLSAgICAvKioKICAgICAgKiBAcGFyYW0g e251bWJlcn0gbGluZU51bWJlcgogICAgICAqLwogICAgIHNjcm9sbFRvTGluZTogZnVuY3Rpb24o bGluZU51bWJlcikKQEAgLTEyMzYsMTUgKzExOTgsMTMgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0 b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUgPSB7CiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UZXh0 RWRpdG9yTW9kZWx9IHRleHRNb2RlbAogICogQHBhcmFtIHs/c3RyaW5nfSB1cmwKICAqLwotV2Vi SW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwgPSBmdW5jdGlvbihkZWxlZ2F0ZSwgdGV4dE1v ZGVsLCB1cmwsIHN5bmNTY3JvbGxMaXN0ZW5lciwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3Rl bmVyLCBlbnRlclRleHRDaGFuZ2VNb2RlLCBleGl0VGV4dENoYW5nZU1vZGUpCitXZWJJbnNwZWN0 b3IuVGV4dEVkaXRvck1haW5QYW5lbCA9IGZ1bmN0aW9uKGRlbGVnYXRlLCB0ZXh0TW9kZWwsIHVy bCwgc3luY1Njcm9sbExpc3RlbmVyLCBzeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVuZXIpCiB7 CiAgICAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwuY2FsbCh0aGlzLCB0ZXh0 TW9kZWwpOwogCiAgICAgdGhpcy5fZGVsZWdhdGUgPSBkZWxlZ2F0ZTsKICAgICB0aGlzLl9zeW5j U2Nyb2xsTGlzdGVuZXIgPSBzeW5jU2Nyb2xsTGlzdGVuZXI7CiAgICAgdGhpcy5fc3luY0RlY29y YXRpb25zRm9yTGluZUxpc3RlbmVyID0gc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyOwot ICAgIHRoaXMuX2VudGVyVGV4dENoYW5nZU1vZGUgPSBlbnRlclRleHRDaGFuZ2VNb2RlOwotICAg IHRoaXMuX2V4aXRUZXh0Q2hhbmdlTW9kZSA9IGV4aXRUZXh0Q2hhbmdlTW9kZTsKIAogICAgIHRo aXMuX3VybCA9IHVybDsKICAgICB0aGlzLl9oaWdobGlnaHRlciA9IG5ldyBXZWJJbnNwZWN0b3Iu VGV4dEVkaXRvckhpZ2hsaWdodGVyKHRleHRNb2RlbCwgdGhpcy5faGlnaGxpZ2h0RGF0YVJlYWR5 LmJpbmQodGhpcykpOwpAQCAtMTQxNCwxNyArMTM3NCw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLmJlZ2luVXBkYXRlcygp OwogCi0gICAgICAgIGZ1bmN0aW9uIGJlZm9yZSgpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHRo aXMuX2VudGVyVGV4dENoYW5nZU1vZGUoKTsKLSAgICAgICAgfQotCi0gICAgICAgIGZ1bmN0aW9u IGFmdGVyKG9sZFJhbmdlLCBuZXdSYW5nZSkKLSAgICAgICAgewotICAgICAgICAgICAgdGhpcy5f ZXhpdFRleHRDaGFuZ2VNb2RlKG9sZFJhbmdlLCBuZXdSYW5nZSk7Ci0gICAgICAgIH0KLQotICAg ICAgICB2YXIgcmFuZ2UgPSByZWRvID8gdGhpcy5fdGV4dE1vZGVsLnJlZG8oYmVmb3JlLmJpbmQo dGhpcyksIGFmdGVyLmJpbmQodGhpcykpIDogdGhpcy5fdGV4dE1vZGVsLnVuZG8oYmVmb3JlLmJp bmQodGhpcyksIGFmdGVyLmJpbmQodGhpcykpOworICAgICAgICB2YXIgcmFuZ2UgPSByZWRvID8g dGhpcy5fdGV4dE1vZGVsLnJlZG8oKSA6IHRoaXMuX3RleHRNb2RlbC51bmRvKCk7CiAKICAgICAg ICAgdGhpcy5lbmRVcGRhdGVzKCk7CiAKQEAgLTE0NTAsNyArMTQwMCw2IEBAIFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHJhbmdlID0g c2VsZWN0aW9uLm5vcm1hbGl6ZSgpOwogCiAgICAgICAgIHRoaXMuYmVnaW5VcGRhdGVzKCk7Ci0g ICAgICAgIHRoaXMuX2VudGVyVGV4dENoYW5nZU1vZGUoKTsKIAogICAgICAgICB2YXIgbmV3UmFu Z2U7CiAgICAgICAgIHZhciByYW5nZVdhc0VtcHR5ID0gcmFuZ2UuaXNFbXB0eSgpOwpAQCAtMTQ2 Myw3ICsxNDEyLDYgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICAgICAgICAgIG5ld1JhbmdlID0gdGhpcy5fdGV4dE1vZGVsLmluZGVudExp bmVzKHJhbmdlKTsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX2V4aXRUZXh0Q2hhbmdlTW9k ZShyYW5nZSwgbmV3UmFuZ2UpOwogICAgICAgICB0aGlzLmVuZFVwZGF0ZXMoKTsKICAgICAgICAg aWYgKHJhbmdlV2FzRW1wdHkpCiAgICAgICAgICAgICBuZXdSYW5nZS5zdGFydENvbHVtbiA9IG5l d1JhbmdlLmVuZENvbHVtbjsKQEAgLTE0OTcsNyArMTQ0NSw2IEBAIFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgICAgICB0aGlzLmJlZ2luVXBkYXRlcygpOwotICAgICAgICB0aGlzLl9lbnRlclRleHRD aGFuZ2VNb2RlKCk7CiAKICAgICAgICAgdmFyIGxpbmVCcmVhayA9IHRoaXMuX3RleHRNb2RlbC5s aW5lQnJlYWs7CiAgICAgICAgIHZhciBuZXdSYW5nZTsKQEAgLTE1MTMsNyArMTQ2MCw2IEBAIFdl Ykluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfSBl bHNlCiAgICAgICAgICAgICBuZXdSYW5nZSA9IHRoaXMuX3RleHRNb2RlbC5lZGl0UmFuZ2UocmFu Z2UsIGxpbmVCcmVhayArIGluZGVudCk7CiAKLSAgICAgICAgdGhpcy5fZXhpdFRleHRDaGFuZ2VN b2RlKHJhbmdlLCBuZXdSYW5nZSk7CiAgICAgICAgIHRoaXMuZW5kVXBkYXRlcygpOwogICAgICAg ICB0aGlzLl9yZXN0b3JlU2VsZWN0aW9uKG5ld1JhbmdlLmNvbGxhcHNlVG9FbmQoKSwgdHJ1ZSk7 CiAKQEAgLTIxODcsMTUgKzIxMzMsMTAgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFu ZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAobGluZXMubGVuZ3RoID09PSAxICYmIGxpbmVz WzBdID09PSAifSIgJiYgb2xkUmFuZ2UuaXNFbXB0eSgpICYmIHNlbGVjdGlvbi5pc0VtcHR5KCkg JiYgIXRoaXMuX3RleHRNb2RlbC5saW5lKG9sZFJhbmdlLmVuZExpbmUpLnRyaW0oKSkKICAgICAg ICAgICAgIHRoaXMuX3VuaW5kZW50QWZ0ZXJCbG9jayhvbGRSYW5nZSwgc2VsZWN0aW9uKTsKIAot ICAgICAgICAvLyBUaGlzIGlzIGEgImZvcmVpZ24iIGNhbGwgb3V0c2lkZSBvZiB0aGlzIGNsYXNz LiBTaG91bGQgYmUgYmVmb3JlIHdlIGRlbGV0ZSB0aGUgZGlydHkgbGluZXMgZmxhZy4KLSAgICAg ICAgdGhpcy5fZW50ZXJUZXh0Q2hhbmdlTW9kZSgpOwotCi0gICAgICAgIHZhciBuZXdSYW5nZSA9 IHRoaXMuX3RleHRNb2RlbC5lZGl0UmFuZ2Uob2xkUmFuZ2UsIG5ld0NvbnRlbnQpOwotCisgICAg ICAgIHRoaXMuX3RleHRNb2RlbC5lZGl0UmFuZ2Uob2xkUmFuZ2UsIG5ld0NvbnRlbnQpOwogICAg ICAgICB0aGlzLl9wYWludFNjaGVkdWxlZExpbmVzKHRydWUpOwogICAgICAgICB0aGlzLl9yZXN0 b3JlU2VsZWN0aW9uKHNlbGVjdGlvbik7CiAKLSAgICAgICAgdGhpcy5fZXhpdFRleHRDaGFuZ2VN b2RlKG9sZFJhbmdlLCBuZXdSYW5nZSk7CiAgICAgICAgIC8vIERlYnVnIGNoZWNrIGZvciB2YWxp ZGF0aW5nIHdoZXRoZXIgdGV4dCBtb2RlbCBtYXRjaGVzIHRoZSBET00gcmVwcmVzZW50YXRpb24u CiAgICAgICAgIC8vIGNvbnNvbGUubG9nKHRoaXMuZWxlbWVudC5pbm5lclRleHQgPT09IHRoaXMu X3RleHRNb2RlbC50ZXh0KCkgKyAiXG4iKTsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9yTW9kZWwuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcwppbmRleCBkOGFjMmJk M2QwZGYzNTc0OTE4NjIwM2IxMDYxMTVmMjI2Mzc4Mjc0Li4wMGZmYTRhNGQ4MjIyMTg0MDAwNmNj N2ZkMTU2MTg0MWE2YzAxM2RiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcwpAQCAtMjI1LDYgKzIyNSw3IEBAIFdlYklu c3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwucHJvdG90eXBlID0gewogICAgICAqLwogICAgIHNldFRl eHQ6IGZ1bmN0aW9uKHRleHQpCiAgICAgeworICAgICAgICB0aGlzLl9yZXNldFVuZG9TdGFjaygp OwogICAgICAgICB0ZXh0ID0gdGV4dCB8fCAiIjsKICAgICAgICAgdmFyIHJhbmdlID0gdGhpcy5y YW5nZSgpOwogICAgICAgICB0aGlzLl9saW5lQnJlYWsgPSAvXHJcbi8udGVzdCh0ZXh0KSA/ICJc clxuIiA6ICJcbiI7CkBAIC00NjMsMTEgKzQ2NCw5IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TW9kZWwucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge2Z1 bmN0aW9uKCk9fSBiZWZvcmVDYWxsYmFjawotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5z cGVjdG9yLlRleHRSYW5nZSwgV2ViSW5zcGVjdG9yLlRleHRSYW5nZSk9fSBhZnRlckNhbGxiYWNr CiAgICAgICogQHJldHVybiB7P1dlYkluc3BlY3Rvci5UZXh0UmFuZ2V9CiAgICAgICovCi0gICAg dW5kbzogZnVuY3Rpb24oYmVmb3JlQ2FsbGJhY2ssIGFmdGVyQ2FsbGJhY2spCisgICAgdW5kbzog ZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl91bmRvU3RhY2subGVuZ3RoKQog ICAgICAgICAgICAgcmV0dXJuIG51bGw7CkBAIC00NzUsMjUgKzQ3NCwyMyBAQCBXZWJJbnNwZWN0 b3IuVGV4dEVkaXRvck1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbWFya1JlZG9h YmxlU3RhdGUoKTsKIAogICAgICAgICB0aGlzLl9pblVuZG8gPSB0cnVlOwotICAgICAgICB2YXIg cmFuZ2UgPSB0aGlzLl9kb1VuZG8odGhpcy5fdW5kb1N0YWNrLCBiZWZvcmVDYWxsYmFjaywgYWZ0 ZXJDYWxsYmFjayk7CisgICAgICAgIHZhciByYW5nZSA9IHRoaXMuX2RvVW5kbyh0aGlzLl91bmRv U3RhY2spOwogICAgICAgICBkZWxldGUgdGhpcy5faW5VbmRvOwogCiAgICAgICAgIHJldHVybiBy YW5nZTsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtmdW5jdGlvbigpPX0gYmVm b3JlQ2FsbGJhY2sKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5UZXh0UmFu Z2UsIFdlYkluc3BlY3Rvci5UZXh0UmFuZ2UpPX0gYWZ0ZXJDYWxsYmFjawogICAgICAqIEByZXR1 cm4ge1dlYkluc3BlY3Rvci5UZXh0UmFuZ2V9CiAgICAgICovCi0gICAgcmVkbzogZnVuY3Rpb24o YmVmb3JlQ2FsbGJhY2ssIGFmdGVyQ2FsbGJhY2spCisgICAgcmVkbzogZnVuY3Rpb24oKQogICAg IHsKICAgICAgICAgaWYgKCF0aGlzLl9yZWRvU3RhY2sgfHwgIXRoaXMuX3JlZG9TdGFjay5sZW5n dGgpCiAgICAgICAgICAgICByZXR1cm4gbnVsbDsKICAgICAgICAgdGhpcy5fbWFya1VuZG9hYmxl U3RhdGUoKTsKIAogICAgICAgICB0aGlzLl9pblJlZG8gPSB0cnVlOwotICAgICAgICB2YXIgcmFu Z2UgPSB0aGlzLl9kb1VuZG8odGhpcy5fcmVkb1N0YWNrLCBiZWZvcmVDYWxsYmFjaywgYWZ0ZXJD YWxsYmFjayk7CisgICAgICAgIHZhciByYW5nZSA9IHRoaXMuX2RvVW5kbyh0aGlzLl9yZWRvU3Rh Y2spOwogICAgICAgICBkZWxldGUgdGhpcy5faW5SZWRvOwogCiAgICAgICAgIHJldHVybiByYW5n ZTsKQEAgLTUwMSwyNSArNDk4LDE1IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwucHJv dG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVjdG9y LlRleHRFZGl0b3JDb21tYW5kPn0gc3RhY2sKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKCk9fSBi ZWZvcmVDYWxsYmFjawotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5zcGVjdG9yLlRleHRS YW5nZSwgV2ViSW5zcGVjdG9yLlRleHRSYW5nZSk9fSBhZnRlckNhbGxiYWNrCiAgICAgICogQHJl dHVybiB7V2ViSW5zcGVjdG9yLlRleHRSYW5nZX0KICAgICAgKi8KLSAgICBfZG9VbmRvOiBmdW5j dGlvbihzdGFjaywgYmVmb3JlQ2FsbGJhY2ssIGFmdGVyQ2FsbGJhY2spCisgICAgX2RvVW5kbzog ZnVuY3Rpb24oc3RhY2spCiAgICAgewogICAgICAgICB2YXIgcmFuZ2UgPSBudWxsOwogICAgICAg ICBmb3IgKHZhciBpID0gc3RhY2subGVuZ3RoIC0gMTsgaSA+PSAwOyAtLWkpIHsKICAgICAgICAg ICAgIHZhciBjb21tYW5kID0gc3RhY2tbaV07CiAgICAgICAgICAgICBzdGFjay5sZW5ndGggPSBp OwotCi0gICAgICAgICAgICBpZiAoYmVmb3JlQ2FsbGJhY2spCi0gICAgICAgICAgICAgICAgYmVm b3JlQ2FsbGJhY2soKTsKLQogICAgICAgICAgICAgcmFuZ2UgPSB0aGlzLl9pbm5lckVkaXRSYW5n ZShjb21tYW5kLm5ld1JhbmdlLCBjb21tYW5kLm9yaWdpbmFsVGV4dCk7Ci0KLSAgICAgICAgICAg IGlmIChhZnRlckNhbGxiYWNrKQotICAgICAgICAgICAgICAgIGFmdGVyQ2FsbGJhY2soY29tbWFu ZC5uZXdSYW5nZSwgcmFuZ2UpOwotCiAgICAgICAgICAgICBpZiAoaSA+IDAgJiYgc3RhY2tbaSAt IDFdLmV4cGxpY2l0KQogICAgICAgICAgICAgICAgIHJldHVybiByYW5nZTsKICAgICAgICAgfQpA QCAtNTM4LDcgKzUyNSw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwucHJvdG90eXBl ID0gewogICAgICAgICAgICAgdGhpcy5fcmVkb1N0YWNrW3RoaXMuX3JlZG9TdGFjay5sZW5ndGgg LSAxXS5leHBsaWNpdCA9IHRydWU7CiAgICAgfSwKIAotICAgIHJlc2V0VW5kb1N0YWNrOiBmdW5j dGlvbigpCisgICAgX3Jlc2V0VW5kb1N0YWNrOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0 aGlzLl91bmRvU3RhY2sgPSBbXTsKICAgICB9LAo=