112037 2013-03-11 10:34:24 -0700 Web Inspector: Fix checkContentUpdated behavior in UISourceCode. 2013-03-12 07:55:48 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov buildbot dglazkov keishi loislo pfeldman pmuellr rniwa vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 852447 0 vsevik 2013-03-11 10:34:24 -0700 Currently checkContentUpdated works unreliably. It should also save last updated content that was loaded and rejected by user on the per-file basis (only the last one is saved currently) 852449 1 192502 vsevik 2013-03-11 10:36:24 -0700 Created attachment 192502 Patch 852507 2 192502 webkit.review.bot 2013-03-11 11:29:11 -0700 Comment on attachment 192502 Patch Attachment 192502 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17156243 New failing tests: inspector/debugger/scripts-panel.html inspector/debugger/live-edit-breakpoints.html inspector/debugger/live-edit.html 852996 3 192502 buildbot 2013-03-11 19:09:49 -0700 Comment on attachment 192502 Patch Attachment 192502 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-commit-queue.appspot.com/results/17178146 New failing tests: inspector/debugger/scripts-panel.html 853330 4 192708 vsevik 2013-03-12 04:25:44 -0700 Created attachment 192708 Patch 853460 5 192708 webkit.review.bot 2013-03-12 07:55:44 -0700 Comment on attachment 192708 Patch Clearing flags on attachment: 192708 Committed r145543: <http://trac.webkit.org/changeset/145543> 853461 6 webkit.review.bot 2013-03-12 07:55:48 -0700 All reviewed patches have been landed. Closing bug. 192502 2013-03-11 10:36:24 -0700 2013-03-12 04:25:39 -0700 Patch bug-112037-20130311213223.patch text/plain 7748 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTBkNjM0MGRhZGJiOTc2 OTZkMDJlMjYxYmZlOWU4ZjVjNzc3YjM3Ni4uNTA1YzEwZmZjNTU4ZjJjN2E4OWJhODhkODk2YjU4 MTFmMjMwZmUxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTExICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEZpeCBjaGVja0NvbnRlbnRVcGRhdGVkIGJlaGF2aW9yIGluIFVJU291cmNlQ29kZS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjAzNworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUucHJvdG90eXBlLmlubmVyQ2FsbGJhY2sp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUucHJvdG90 eXBlLnJlcXVlc3RGaWxlQ29udGVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9V SVNvdXJjZUNvZGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3Rv dHlwZS5jaGVja0NvbnRlbnRVcGRhdGVkLmNvbnRlbnRMb2FkZWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUuY2hlY2tDb250ZW50VXBkYXRlZCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZS5fY29tbWl0Q29udGVudCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZS5hZGRSZXZpc2lv bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZS5jb21taXRX b3JraW5nQ29weSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2UuanM6 CisKIDIwMTMtMDMtMTAgIE1hdHQgRmFsa2VuaGFnZW4gIDxmYWxrZW5AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIEltcGxlbWVudCBpbmVydCBzdWJ0cmVlcyBuZWVkZWQgZm9yIG1vZGFsIDxkaWFs b2c+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVT eXN0ZW1Qcm9qZWN0RGVsZWdhdGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0ZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUuanMKaW5kZXggZDUyN2QwMTBmMGY2ZTNhMWI4 YmQ3OTk2YTFjM2VlNjY0N2I3ZmM1Yi4uNGZjMDZiMGZjYjBkZDI4MTc1MTdmMTYyZmJjOTY5YTdk N2I5ZThhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9G aWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5qcwpAQCAtMTA0LDcgKzEwNCw2 IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICovCiAgICAgICAgIGZ1bmN0aW9uIGlubmVyQ2FsbGJhY2soY29udGVudCkKICAg ICAgICAgewotICAgICAgICAgICAgdGhpcy5fY29udGVudFJlcXVlc3RGaW5pc2hlZChwYXRoLCBj b250ZW50KTsKICAgICAgICAgICAgIHZhciBjb250ZW50VHlwZSA9IHRoaXMuX2NvbnRlbnRUeXBl Rm9yUGF0aChwYXRoKTsKICAgICAgICAgICAgIGNhbGxiYWNrKGNvbnRlbnQsIGZhbHNlLCBjb250 ZW50VHlwZS5jYW5vbmljYWxNaW1lVHlwZSgpKTsKICAgICAgICAgfQpAQCAtMTEyLDM5ICsxMTEs NiBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7 CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+fSBwYXRoCi0gICAgICog QHBhcmFtIHtzdHJpbmd9IGNvbnRlbnQKLSAgICAgKi8KLSAgICBfY29udGVudFJlcXVlc3RGaW5p c2hlZDogZnVuY3Rpb24ocGF0aCwgY29udGVudCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX2xhc3RD b250ZW50UmVxdWVzdFBhdGggPSBwYXRoOwotICAgICAgICB0aGlzLl9sYXN0Q29udGVudFJlcXVl c3RDb250ZW50ID0gY29udGVudDsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtB cnJheS48c3RyaW5nPn0gcGF0aAotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBjdXJyZW50Q29udGVu dAotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyl9IGNhbGxiYWNrCi0gICAgICovCi0g ICAgcmVxdWVzdFVwZGF0ZWRGaWxlQ29udGVudDogZnVuY3Rpb24ocGF0aCwgY3VycmVudENvbnRl bnQsIGNhbGxiYWNrKQotICAgIHsKLSAgICAgICAgdmFyIGZpbGVQYXRoID0gdGhpcy5fZmlsZVBh dGhGb3JQYXRoKHBhdGgpOwotICAgICAgICB0aGlzLl9maWxlU3lzdGVtLnJlcXVlc3RGaWxlQ29u dGVudChmaWxlUGF0aCwgaW5uZXJDYWxsYmFjay5iaW5kKHRoaXMpKTsKLQotICAgICAgICAvKioK LSAgICAgICAgICogQHBhcmFtIHs/c3RyaW5nfSBjb250ZW50Ci0gICAgICAgICAqLwotICAgICAg ICBmdW5jdGlvbiBpbm5lckNhbGxiYWNrKGNvbnRlbnQpCi0gICAgICAgIHsKLSAgICAgICAgICAg IHZhciBwcmV2aW91c0NvbnRlbnQgPSB0aGlzLl9sYXN0Q29udGVudFJlcXVlc3RQYXRoID09PSBw YXRoID8gdGhpcy5fbGFzdENvbnRlbnRSZXF1ZXN0Q29udGVudCA6IG51bGw7Ci0gICAgICAgICAg ICBpZiAodHlwZW9mIHByZXZpb3VzQ29udGVudCAhPT0gInN0cmluZyIpCi0gICAgICAgICAgICAg ICAgcHJldmlvdXNDb250ZW50ID0gY3VycmVudENvbnRlbnQ7Ci0gICAgICAgICAgICB0aGlzLl9j b250ZW50UmVxdWVzdEZpbmlzaGVkKHBhdGgsIGNvbnRlbnQpOwotICAgICAgICAgICAgY2FsbGJh Y2soY29udGVudCAhPT0gcHJldmlvdXNDb250ZW50ID8gY29udGVudCA6IG51bGwpOwotICAgICAg ICB9Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7QXJyYXkuPHN0cmluZz59IHBh dGgKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gbmV3Q29udGVudAogICAgICAqIEBwYXJhbSB7ZnVu Y3Rpb24oP3N0cmluZyl9IGNhbGxiYWNrCiAgICAgICovCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCmluZGV4IGMyZTA2NzRhMjJmOGNj MmFkMWFmMTgxYmZmMjZmMmFlNThhMWZmYTcuLjc0MWRmNjA2ZDFlMmVjMWUzYmEyNTkyNjIzYjkx MTUwYTc2YzdlM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVUlTb3VyY2VDb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVUlTb3VyY2VDb2RlLmpzCkBAIC0yMTYsMjEgKzIxNiwzNCBAQCBXZWJJbnNwZWN0b3IuVUlT b3VyY2VDb2RlLnByb3RvdHlwZSA9IHsKIAogICAgIGNoZWNrQ29udGVudFVwZGF0ZWQ6IGZ1bmN0 aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3Byb2plY3QucmVxdWVzdFVwZGF0ZWRGaWxlQ29u dGVudCh0aGlzLCB1cGRhdGVkQ29udGVudExvYWRlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgaWYg KHRoaXMuX2NoZWNraW5nQ29udGVudCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhp cy5fY2hlY2tpbmdDb250ZW50ID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fcHJvamVjdC5yZXF1ZXN0 RmlsZUNvbnRlbnQodGhpcywgY29udGVudExvYWRlZC5iaW5kKHRoaXMpKTsKIAotICAgICAgICBm dW5jdGlvbiB1cGRhdGVkQ29udGVudExvYWRlZCh1cGRhdGVkQ29udGVudCkKKyAgICAgICAgZnVu Y3Rpb24gY29udGVudExvYWRlZCh1cGRhdGVkQ29udGVudCkKICAgICAgICAgewotICAgICAgICAg ICAgaWYgKHR5cGVvZiB1cGRhdGVkQ29udGVudCAhPT0gInN0cmluZyIpCisgICAgICAgICAgICBp ZiAodHlwZW9mIHRoaXMuX2xhc3RBY2NlcHRlZENvbnRlbnQgPT09ICJzdHJpbmciICYmIHRoaXMu X2xhc3RBY2NlcHRlZENvbnRlbnQgPT09IHVwZGF0ZWRDb250ZW50KSB7CisgICAgICAgICAgICAg ICAgZGVsZXRlIHRoaXMuX2NoZWNraW5nQ29udGVudDsKKyAgICAgICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAodGhpcy5fY29udGVudCA9PT0gdXBkYXRl ZENvbnRlbnQpIHsKKyAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fY2hlY2tpbmdDb250ZW50 OwogICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAg aWYgKCF0aGlzLmlzRGlydHkoKSkgewotICAgICAgICAgICAgICAgIHRoaXMuYWRkUmV2aXNpb24o dXBkYXRlZENvbnRlbnQpOworICAgICAgICAgICAgICAgIHRoaXMuX2NvbW1pdENvbnRlbnQodXBk YXRlZENvbnRlbnQsIGZhbHNlKTsKKyAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fY2hlY2tp bmdDb250ZW50OwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAogICAg ICAgICAgICAgdmFyIHNob3VsZFVwZGF0ZSA9IHdpbmRvdy5jb25maXJtKFdlYkluc3BlY3Rvci5V SVN0cmluZygiVGhpcyBmaWxlIHdhcyBjaGFuZ2VkIGV4dGVybmFsbHkuIFdvdWxkIHlvdSBsaWtl IHRvIHJlbG9hZCBpdD8iKSk7CiAgICAgICAgICAgICBpZiAoc2hvdWxkVXBkYXRlKQotICAgICAg ICAgICAgICAgIHRoaXMuYWRkUmV2aXNpb24odXBkYXRlZENvbnRlbnQpOworICAgICAgICAgICAg ICAgIHRoaXMuX2NvbW1pdENvbnRlbnQodXBkYXRlZENvbnRlbnQsIGZhbHNlKTsKKyAgICAgICAg ICAgIGVsc2UKKyAgICAgICAgICAgICAgICB0aGlzLl9sYXN0QWNjZXB0ZWRDb250ZW50ID0gdXBk YXRlZENvbnRlbnQ7CisgICAgICAgICAgICBkZWxldGUgdGhpcy5fY2hlY2tpbmdDb250ZW50Owog ICAgICAgICB9CiAgICAgfSwKIApAQCAtMjQ0LDggKzI1Nyw5IEBAIFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGUucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtzdHJpbmd9 IGNvbnRlbnQKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IHNob3VsZFNldENvbnRlbnRJblByb2pl Y3QKICAgICAgKi8KLSAgICBfY29tbWl0Q29udGVudDogZnVuY3Rpb24oY29udGVudCkKKyAgICBf Y29tbWl0Q29udGVudDogZnVuY3Rpb24oY29udGVudCwgc2hvdWxkU2V0Q29udGVudEluUHJvamVj dCkKICAgICB7CiAgICAgICAgIHRoaXMuX2NvbnRlbnQgPSBjb250ZW50OwogICAgICAgICB0aGlz Ll9jb250ZW50TG9hZGVkID0gdHJ1ZTsKQEAgLTI2NCw3ICsyNzgsOCBAQCBXZWJJbnNwZWN0b3Iu VUlTb3VyY2VDb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5maWxl TWFuYWdlci5zYXZlKHRoaXMuX3VybCwgdGhpcy5fY29udGVudCwgZmFsc2UpOwogICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLmZpbGVNYW5hZ2VyLmNsb3NlKHRoaXMuX3VybCk7CiAgICAgICAgIH0K LSAgICAgICAgdGhpcy5fcHJvamVjdC5zZXRGaWxlQ29udGVudCh0aGlzLCB0aGlzLl9jb250ZW50 LCBmdW5jdGlvbigpIHsgfSk7CisgICAgICAgIGlmIChzaG91bGRTZXRDb250ZW50SW5Qcm9qZWN0 KQorICAgICAgICAgICAgdGhpcy5fcHJvamVjdC5zZXRGaWxlQ29udGVudCh0aGlzLCB0aGlzLl9j b250ZW50LCBmdW5jdGlvbigpIHsgfSk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMjcyLDcgKzI4 Nyw3IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewogICAgICAqLwog ICAgIGFkZFJldmlzaW9uOiBmdW5jdGlvbihjb250ZW50KQogICAgIHsKLSAgICAgICAgdGhpcy5f Y29tbWl0Q29udGVudChjb250ZW50KTsKKyAgICAgICAgdGhpcy5fY29tbWl0Q29udGVudChjb250 ZW50LCB0cnVlKTsKICAgICB9LAogCiAgICAgX3Jlc3RvcmVSZXZpc2lvbkhpc3Rvcnk6IGZ1bmN0 aW9uKCkKQEAgLTQwNSw3ICs0MjAsNyBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMu X2NvbW1pdENvbnRlbnQodGhpcy5fd29ya2luZ0NvcHkpOworICAgICAgICB0aGlzLl9jb21taXRD b250ZW50KHRoaXMuX3dvcmtpbmdDb3B5LCB0cnVlKTsKICAgICAgICAgY2FsbGJhY2sobnVsbCk7 CiAKICAgICAgICAgV2ViSW5zcGVjdG9yLm5vdGlmaWNhdGlvbnMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5Vc2VyTWV0cmljcy5Vc2VyQWN0aW9uLCB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtzcGFjZS5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV29ya3NwYWNlLmpzCmluZGV4IGU3N2RjYzcz ZWE2MWZiZjVmNzZhMmZiMzVkNmM0YWM4MGU1NTVlZTkuLjc2YzNkZjcwOWI0NmY3ZmU0MWUzZTAw OWVmYmJjYjM0NjFhN2ZmM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvV29ya3NwYWNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvV29ya3NwYWNlLmpzCkBAIC0xMDIsMTMgKzEwMiw2IEBAIFdlYkluc3BlY3Rvci5Qcm9q ZWN0RGVsZWdhdGUucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtBcnJh eS48c3RyaW5nPn0gcGF0aAotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBjdXJyZW50Q29udGVudAot ICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyl9IGNhbGxiYWNrCi0gICAgICovCi0gICAg cmVxdWVzdFVwZGF0ZWRGaWxlQ29udGVudDogZnVuY3Rpb24ocGF0aCwgY3VycmVudENvbnRlbnQs IGNhbGxiYWNrKSB7IH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+ fSBwYXRoCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IG5ld0NvbnRlbnQKICAgICAgKiBAcGFyYW0g e2Z1bmN0aW9uKD9zdHJpbmcpfSBjYWxsYmFjawogICAgICAqLwpAQCAtMjUwLDE1ICsyNDMsNiBA QCBXZWJJbnNwZWN0b3IuUHJvamVjdC5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQotICAgICAqIEBw YXJhbSB7ZnVuY3Rpb24oP3N0cmluZyl9IGNhbGxiYWNrCi0gICAgICovCi0gICAgcmVxdWVzdFVw ZGF0ZWRGaWxlQ29udGVudDogZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBjYWxsYmFjaykKLSAgICB7 Ci0gICAgICAgIHRoaXMuX3Byb2plY3REZWxlZ2F0ZS5yZXF1ZXN0VXBkYXRlZEZpbGVDb250ZW50 KHVpU291cmNlQ29kZS5wYXRoKCksIHVpU291cmNlQ29kZS53b3JraW5nQ29weSgpLCBjYWxsYmFj ayk7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291 cmNlQ29kZX0gdWlTb3VyY2VDb2RlCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IG5ld0NvbnRlbnQK ICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSBjYWxsYmFjawogICAgICAqLwo= 192708 2013-03-12 04:25:44 -0700 2013-03-12 07:55:44 -0700 Patch bug-112037-20130312152142.patch text/plain 9740 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1NDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmU2NWQ1OTgxYTliY2Ni YzM0MGRmOWU0NTUyNWY3ODk1ZTA5M2Q2ZS4uZWM2OWJhMmEzNDU5YTU3ZWFkMWY5YjEzMzE1MGQz YmViYzMzNjNhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAzLTEyICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEZpeCBjaGVja0NvbnRlbnRVcGRhdGVkIGJlaGF2aW9yIGluIFVJU291cmNlQ29kZS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjAzNworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVJU291cmNlQ29k ZS5jaGVja0NvbnRlbnRVcGRhdGVkIG5vdyBzYXZlcyBsYXN0IHVwZGF0ZWQgY29udGVudCB0aGF0 IHdhcyBsb2FkZWQgYW5kIHJlamVjdGVkCisgICAgICAgIGJ5IHVzZXIgb24gdGhlIHBlci1maWxl IGJhc2lzIChvbmx5IHRoZSBsYXN0IG9uZSB3YXMgc2F2ZWQgY3VycmVudGx5KS4KKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZS5p bm5lckNhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERl bGVnYXRlLnByb3RvdHlwZS5yZXF1ZXN0RmlsZUNvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUucHJvdG90eXBlLmNhblNldEZpbGVDb250ZW50 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtV29ya3NwYWNlUHJvdmlkZXIucHJv dG90eXBlLl9maWxlU3lzdGVtQWRkZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv U2ltcGxlV29ya3NwYWNlUHJvdmlkZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2ltcGxl UHJvamVjdERlbGVnYXRlLnByb3RvdHlwZS5jYW5TZXRGaWxlQ29udGVudCk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZS5jaGVja0NvbnRlbnRVcGRhdGVkLmNvbnRlbnRMb2Fk ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUuY2hlY2tD b250ZW50VXBkYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3Rv dHlwZS5fY29tbWl0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2Rl LnByb3RvdHlwZS5hZGRSZXZpc2lvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlLnByb3RvdHlwZS5jb21taXRXb3JraW5nQ29weSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Xb3Jrc3BhY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvamVjdERlbGVn YXRlLnByb3RvdHlwZS5jYW5TZXRGaWxlQ29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu UHJvamVjdC5wcm90b3R5cGUuY2FuU2V0RmlsZUNvbnRlbnQpOgorCiAyMDEzLTAzLTEyICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtUaW1lbGluZV0gRmlsZSBzZWxlY3RvciBjb250cm9sIGJlY29tZXMgdmlzaWJsZSBv biAidGFiIiBuYXZpZ2F0aW9uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLmpzCmluZGV4IGQ1 MjdkMDEwZjBmNmUzYTFiOGJkNzk5NmExYzNlZTY2NDdiN2ZjNWIuLmRjNzFiY2RkZGVhNDg3ZDFm NDNlMDBjNmJhNzM2N2JkNWJkMjcwZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUuanMK QEAgLTEwNCw0MyArMTA0LDE3IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERlbGVn YXRlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICovCiAgICAgICAgIGZ1bmN0aW9uIGlubmVyQ2Fs bGJhY2soY29udGVudCkKICAgICAgICAgewotICAgICAgICAgICAgdGhpcy5fY29udGVudFJlcXVl c3RGaW5pc2hlZChwYXRoLCBjb250ZW50KTsKICAgICAgICAgICAgIHZhciBjb250ZW50VHlwZSA9 IHRoaXMuX2NvbnRlbnRUeXBlRm9yUGF0aChwYXRoKTsKICAgICAgICAgICAgIGNhbGxiYWNrKGNv bnRlbnQsIGZhbHNlLCBjb250ZW50VHlwZS5jYW5vbmljYWxNaW1lVHlwZSgpKTsKICAgICAgICAg fQogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+fSBwYXRo Ci0gICAgICogQHBhcmFtIHtzdHJpbmd9IGNvbnRlbnQKKyAgICAgKiBAcmV0dXJuIHtib29sZWFu fQogICAgICAqLwotICAgIF9jb250ZW50UmVxdWVzdEZpbmlzaGVkOiBmdW5jdGlvbihwYXRoLCBj b250ZW50KQorICAgIGNhblNldEZpbGVDb250ZW50OiBmdW5jdGlvbigpCiAgICAgewotICAgICAg ICB0aGlzLl9sYXN0Q29udGVudFJlcXVlc3RQYXRoID0gcGF0aDsKLSAgICAgICAgdGhpcy5fbGFz dENvbnRlbnRSZXF1ZXN0Q29udGVudCA9IGNvbnRlbnQ7Ci0gICAgfSwKLQotICAgIC8qKgotICAg ICAqIEBwYXJhbSB7QXJyYXkuPHN0cmluZz59IHBhdGgKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30g Y3VycmVudENvbnRlbnQKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSBjYWxsYmFj awotICAgICAqLwotICAgIHJlcXVlc3RVcGRhdGVkRmlsZUNvbnRlbnQ6IGZ1bmN0aW9uKHBhdGgs IGN1cnJlbnRDb250ZW50LCBjYWxsYmFjaykKLSAgICB7Ci0gICAgICAgIHZhciBmaWxlUGF0aCA9 IHRoaXMuX2ZpbGVQYXRoRm9yUGF0aChwYXRoKTsKLSAgICAgICAgdGhpcy5fZmlsZVN5c3RlbS5y ZXF1ZXN0RmlsZUNvbnRlbnQoZmlsZVBhdGgsIGlubmVyQ2FsbGJhY2suYmluZCh0aGlzKSk7Ci0K LSAgICAgICAgLyoqCi0gICAgICAgICAqIEBwYXJhbSB7P3N0cmluZ30gY29udGVudAotICAgICAg ICAgKi8KLSAgICAgICAgZnVuY3Rpb24gaW5uZXJDYWxsYmFjayhjb250ZW50KQotICAgICAgICB7 Ci0gICAgICAgICAgICB2YXIgcHJldmlvdXNDb250ZW50ID0gdGhpcy5fbGFzdENvbnRlbnRSZXF1 ZXN0UGF0aCA9PT0gcGF0aCA/IHRoaXMuX2xhc3RDb250ZW50UmVxdWVzdENvbnRlbnQgOiBudWxs OwotICAgICAgICAgICAgaWYgKHR5cGVvZiBwcmV2aW91c0NvbnRlbnQgIT09ICJzdHJpbmciKQot ICAgICAgICAgICAgICAgIHByZXZpb3VzQ29udGVudCA9IGN1cnJlbnRDb250ZW50OwotICAgICAg ICAgICAgdGhpcy5fY29udGVudFJlcXVlc3RGaW5pc2hlZChwYXRoLCBjb250ZW50KTsKLSAgICAg ICAgICAgIGNhbGxiYWNrKGNvbnRlbnQgIT09IHByZXZpb3VzQ29udGVudCA/IGNvbnRlbnQgOiBu dWxsKTsKLSAgICAgICAgfQorICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9LAogCiAgICAgLyoq CkBAIC0yNjksNyArMjQzLDcgQEAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Xb3Jrc3BhY2VQcm92 aWRlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBwcm9qZWN0SWQgPSBXZWJJbnNwZWN0b3Iu RmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5wcm9qZWN0SWQoZmlsZVN5c3RlbS5wYXRoKCkpOwog ICAgICAgICB2YXIgcHJvamVjdERlbGVnYXRlID0gbmV3IFdlYkluc3BlY3Rvci5GaWxlU3lzdGVt UHJvamVjdERlbGVnYXRlKGZpbGVTeXN0ZW0sIHRoaXMuX3dvcmtzcGFjZSkKICAgICAgICAgdGhp cy5fc2ltcGxlUHJvamVjdERlbGVnYXRlc1twcm9qZWN0RGVsZWdhdGUuaWQoKV0gPSBwcm9qZWN0 RGVsZWdhdGU7Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KCFwcm9qZWN0RGVsZWdhdGUuaWQoKSk7 CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl93b3Jrc3BhY2UucHJvamVjdChwcm9qZWN0 RGVsZWdhdGUuaWQoKSkpOwogICAgICAgICB0aGlzLl93b3Jrc3BhY2UuYWRkUHJvamVjdChwcm9q ZWN0RGVsZWdhdGUpOwogICAgICAgICBwcm9qZWN0RGVsZWdhdGUucG9wdWxhdGUoKTsKICAgICB9 LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaW1wbGVX b3Jrc3BhY2VQcm92aWRlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2ltcGxlV29ya3NwYWNlUHJvdmlkZXIuanMKaW5kZXggZGJlYTliZGUyNjAyODNjNDczNTY1MGFl NjkzYTNhYWNkMGMzZjNmNS4uOWQzY2QyNDZlMzdmYmUzODgwMjdhNDdjMGFhYWNiMmMwNGMyM2E2 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaW1wbGVX b3Jrc3BhY2VQcm92aWRlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NpbXBsZVdvcmtzcGFjZVByb3ZpZGVyLmpzCkBAIC05OCwxMyArOTgsMTEgQEAgV2ViSW5z cGVjdG9yLlNpbXBsZVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAg IC8qKgotICAgICAqIEBwYXJhbSB7QXJyYXkuPHN0cmluZz59IHBhdGgKLSAgICAgKiBAcGFyYW0g e3N0cmluZ30gY3VycmVudENvbnRlbnQKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcp fSBjYWxsYmFjaworICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CiAgICAgICovCi0gICAgcmVxdWVz dFVwZGF0ZWRGaWxlQ29udGVudDogZnVuY3Rpb24ocGF0aCwgY3VycmVudENvbnRlbnQsIGNhbGxi YWNrKQorICAgIGNhblNldEZpbGVDb250ZW50OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBj YWxsYmFjayhudWxsKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0sCiAKICAgICAvKioK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VD b2RlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUu anMKaW5kZXggYzJlMDY3NGEyMmY4Y2MyYWQxYWYxODFiZmYyNmYyYWU1OGExZmZhNy4uNmFkNjli ZmE1MTkxMWU4NmM2Nzg2MDc4NDY5YWI5NTFkODIwOTI4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKQEAgLTIxNiwyMSArMjE2 LDM2IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewogCiAgICAgY2hl Y2tDb250ZW50VXBkYXRlZDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fcHJvamVj dC5yZXF1ZXN0VXBkYXRlZEZpbGVDb250ZW50KHRoaXMsIHVwZGF0ZWRDb250ZW50TG9hZGVkLmJp bmQodGhpcykpOworICAgICAgICBpZiAoIXRoaXMuX3Byb2plY3QuY2FuU2V0RmlsZUNvbnRlbnQo KSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgaWYgKHRoaXMuX2NoZWNraW5nQ29udGVu dCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fY2hlY2tpbmdDb250ZW50ID0g dHJ1ZTsKKyAgICAgICAgdGhpcy5fcHJvamVjdC5yZXF1ZXN0RmlsZUNvbnRlbnQodGhpcywgY29u dGVudExvYWRlZC5iaW5kKHRoaXMpKTsKIAotICAgICAgICBmdW5jdGlvbiB1cGRhdGVkQ29udGVu dExvYWRlZCh1cGRhdGVkQ29udGVudCkKKyAgICAgICAgZnVuY3Rpb24gY29udGVudExvYWRlZCh1 cGRhdGVkQ29udGVudCkKICAgICAgICAgewotICAgICAgICAgICAgaWYgKHR5cGVvZiB1cGRhdGVk Q29udGVudCAhPT0gInN0cmluZyIpCisgICAgICAgICAgICBpZiAodHlwZW9mIHRoaXMuX2xhc3RB Y2NlcHRlZENvbnRlbnQgPT09ICJzdHJpbmciICYmIHRoaXMuX2xhc3RBY2NlcHRlZENvbnRlbnQg PT09IHVwZGF0ZWRDb250ZW50KSB7CisgICAgICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2NoZWNr aW5nQ29udGVudDsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAg ICAgICAgICBpZiAodGhpcy5fY29udGVudCA9PT0gdXBkYXRlZENvbnRlbnQpIHsKKyAgICAgICAg ICAgICAgICBkZWxldGUgdGhpcy5fY2hlY2tpbmdDb250ZW50OwogICAgICAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKCF0aGlzLmlzRGlydHkoKSkg ewotICAgICAgICAgICAgICAgIHRoaXMuYWRkUmV2aXNpb24odXBkYXRlZENvbnRlbnQpOworICAg ICAgICAgICAgICAgIHRoaXMuX2NvbW1pdENvbnRlbnQodXBkYXRlZENvbnRlbnQsIGZhbHNlKTsK KyAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fY2hlY2tpbmdDb250ZW50OwogICAgICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgdmFyIHNob3VsZFVw ZGF0ZSA9IHdpbmRvdy5jb25maXJtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGhpcyBmaWxlIHdh cyBjaGFuZ2VkIGV4dGVybmFsbHkuIFdvdWxkIHlvdSBsaWtlIHRvIHJlbG9hZCBpdD8iKSk7CiAg ICAgICAgICAgICBpZiAoc2hvdWxkVXBkYXRlKQotICAgICAgICAgICAgICAgIHRoaXMuYWRkUmV2 aXNpb24odXBkYXRlZENvbnRlbnQpOworICAgICAgICAgICAgICAgIHRoaXMuX2NvbW1pdENvbnRl bnQodXBkYXRlZENvbnRlbnQsIGZhbHNlKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAg ICAgICB0aGlzLl9sYXN0QWNjZXB0ZWRDb250ZW50ID0gdXBkYXRlZENvbnRlbnQ7CisgICAgICAg ICAgICBkZWxldGUgdGhpcy5fY2hlY2tpbmdDb250ZW50OwogICAgICAgICB9CiAgICAgfSwKIApA QCAtMjQ0LDggKzI1OSw5IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0g ewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IGNvbnRlbnQKKyAgICAgKiBAcGFy YW0ge2Jvb2xlYW59IHNob3VsZFNldENvbnRlbnRJblByb2plY3QKICAgICAgKi8KLSAgICBfY29t bWl0Q29udGVudDogZnVuY3Rpb24oY29udGVudCkKKyAgICBfY29tbWl0Q29udGVudDogZnVuY3Rp b24oY29udGVudCwgc2hvdWxkU2V0Q29udGVudEluUHJvamVjdCkKICAgICB7CiAgICAgICAgIHRo aXMuX2NvbnRlbnQgPSBjb250ZW50OwogICAgICAgICB0aGlzLl9jb250ZW50TG9hZGVkID0gdHJ1 ZTsKQEAgLTI2NCw3ICsyODAsOCBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5maWxlTWFuYWdlci5zYXZlKHRoaXMuX3Vy bCwgdGhpcy5fY29udGVudCwgZmFsc2UpOwogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmZpbGVN YW5hZ2VyLmNsb3NlKHRoaXMuX3VybCk7CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5fcHJvamVj dC5zZXRGaWxlQ29udGVudCh0aGlzLCB0aGlzLl9jb250ZW50LCBmdW5jdGlvbigpIHsgfSk7Cisg ICAgICAgIGlmIChzaG91bGRTZXRDb250ZW50SW5Qcm9qZWN0KQorICAgICAgICAgICAgdGhpcy5f cHJvamVjdC5zZXRGaWxlQ29udGVudCh0aGlzLCB0aGlzLl9jb250ZW50LCBmdW5jdGlvbigpIHsg fSk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMjcyLDcgKzI4OSw3IEBAIFdlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGUucHJvdG90eXBlID0gewogICAgICAqLwogICAgIGFkZFJldmlzaW9uOiBmdW5j dGlvbihjb250ZW50KQogICAgIHsKLSAgICAgICAgdGhpcy5fY29tbWl0Q29udGVudChjb250ZW50 KTsKKyAgICAgICAgdGhpcy5fY29tbWl0Q29udGVudChjb250ZW50LCB0cnVlKTsKICAgICB9LAog CiAgICAgX3Jlc3RvcmVSZXZpc2lvbkhpc3Rvcnk6IGZ1bmN0aW9uKCkKQEAgLTQwNSw3ICs0MjIs NyBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX2NvbW1pdENvbnRlbnQodGhpcy5f d29ya2luZ0NvcHkpOworICAgICAgICB0aGlzLl9jb21taXRDb250ZW50KHRoaXMuX3dvcmtpbmdD b3B5LCB0cnVlKTsKICAgICAgICAgY2FsbGJhY2sobnVsbCk7CiAKICAgICAgICAgV2ViSW5zcGVj dG9yLm5vdGlmaWNhdGlvbnMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5V c2VyTWV0cmljcy5Vc2VyQWN0aW9uLCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1dvcmtzcGFjZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvV29ya3NwYWNlLmpzCmluZGV4IGU3N2RjYzczZWE2MWZiZjVmNzZhMmZiMzVkNmM0 YWM4MGU1NTVlZTkuLmM0YWViY2Q3MTlkMDhhOGE1OTRkMzFkZDQ1YzI4OGVmNjBhM2UxMDMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV29ya3NwYWNlLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV29ya3NwYWNlLmpzCkBA IC0xMDEsMTEgKzEwMSw5IEBAIFdlYkluc3BlY3Rvci5Qcm9qZWN0RGVsZWdhdGUucHJvdG90eXBl ID0gewogICAgIHJlcXVlc3RGaWxlQ29udGVudDogZnVuY3Rpb24ocGF0aCwgY2FsbGJhY2spIHsg fSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7QXJyYXkuPHN0cmluZz59IHBhdGgKLSAgICAg KiBAcGFyYW0ge3N0cmluZ30gY3VycmVudENvbnRlbnQKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9u KD9zdHJpbmcpfSBjYWxsYmFjaworICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CiAgICAgICovCi0g ICAgcmVxdWVzdFVwZGF0ZWRGaWxlQ29udGVudDogZnVuY3Rpb24ocGF0aCwgY3VycmVudENvbnRl bnQsIGNhbGxiYWNrKSB7IH0sCisgICAgY2FuU2V0RmlsZUNvbnRlbnQ6IGZ1bmN0aW9uKCkgeyB9 LAogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtBcnJheS48c3RyaW5nPn0gcGF0aApAQCAtMjQ5 LDEyICsyNDcsMTEgQEAgV2ViSW5zcGVjdG9yLlByb2plY3QucHJvdG90eXBlID0gewogICAgIH0s CiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVp U291cmNlQ29kZQotICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyl9IGNhbGxiYWNrCisg ICAgICogQHJldHVybiB7Ym9vbGVhbn0KICAgICAgKi8KLSAgICByZXF1ZXN0VXBkYXRlZEZpbGVD b250ZW50OiBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIGNhbGxiYWNrKQorICAgIGNhblNldEZpbGVD b250ZW50OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLl9wcm9qZWN0RGVsZWdhdGUu cmVxdWVzdFVwZGF0ZWRGaWxlQ29udGVudCh1aVNvdXJjZUNvZGUucGF0aCgpLCB1aVNvdXJjZUNv ZGUud29ya2luZ0NvcHkoKSwgY2FsbGJhY2spOworICAgICAgICByZXR1cm4gdGhpcy5fcHJvamVj dERlbGVnYXRlLmNhblNldEZpbGVDb250ZW50KCk7CiAgICAgfSwKIAogICAgIC8qKgo=