83701 2012-04-11 09:47:28 -0700 Web Inspector: Move meta node out of nodes in snapshot serialization. 2012-04-12 08:57:42 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 alph webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 600335 0 alph 2012-04-11 09:47:28 -0700 Also add node_count and edge_count to eliminate arrays reallocation. 600337 1 136683 alph 2012-04-11 09:51:54 -0700 Created attachment 136683 Patch 601110 2 136683 yurys 2012-04-12 05:04:03 -0700 Comment on attachment 136683 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136683&action=review > Source/WebCore/inspector/front-end/HeapSnapshot.js:159 > + delete this._snapshot.snapshot.meta; Instead of assigning it to a new variable on this._snapshot you can leave "meta" node and access it later using this._snapshot.snapshot.meta, what's wrong with that? 601114 3 136683 alph 2012-04-12 05:08:15 -0700 Comment on attachment 136683 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136683&action=review >> Source/WebCore/inspector/front-end/HeapSnapshot.js:159 >> + delete this._snapshot.snapshot.meta; > > Instead of assigning it to a new variable on this._snapshot you can leave "meta" node and access it later using this._snapshot.snapshot.meta, what's wrong with that? Nothing wrong, it's just longer and I have to update it in several places. Do you insist? 601123 4 136683 yurys 2012-04-12 05:25:40 -0700 Comment on attachment 136683 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136683&action=review >>> Source/WebCore/inspector/front-end/HeapSnapshot.js:159 >>> + delete this._snapshot.snapshot.meta; >> >> Instead of assigning it to a new variable on this._snapshot you can leave "meta" node and access it later using this._snapshot.snapshot.meta, what's wrong with that? > > Nothing wrong, it's just longer and I have to update it in several places. Do you insist? this._snapshot.metaNode is not much shorter than this._snapshot.snapshot.meta but requires additional processing of input data, and anyway you can use a local alias if a name feels long. 601147 5 136889 alph 2012-04-12 06:05:37 -0700 Created attachment 136889 Patch 601164 6 136889 webkit.review.bot 2012-04-12 06:38:56 -0700 Comment on attachment 136889 Patch Rejecting attachment 136889 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: t 203 (offset 7 lines). Hunk #4 succeeded at 223 (offset 7 lines). Hunk #5 FAILED at 798. 1 out of 5 hunks FAILED -- saving rejects to file Source/WebCore/inspector/front-end/HeapSnapshot.js.rej patching file LayoutTests/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file LayoutTests/inspector/profiler/heap-snapshot-test.js Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Yury Semik..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12395240 601187 7 136899 alph 2012-04-12 06:58:03 -0700 Created attachment 136899 Patch 601268 8 136899 webkit.review.bot 2012-04-12 08:57:36 -0700 Comment on attachment 136899 Patch Clearing flags on attachment: 136899 Committed r113988: <http://trac.webkit.org/changeset/113988> 601269 9 webkit.review.bot 2012-04-12 08:57:42 -0700 All reviewed patches have been landed. Closing bug. 136683 2012-04-11 09:51:54 -0700 2012-04-12 06:05:27 -0700 Patch bug-83701-20120411205153.patch text/plain 5394 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzODUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzkzNjA0MmE0NmVkMGZi ZTkwNTg4ZTQ3ZTIzNjNjNjAzZGViZWMxMS4uYjlkNGNjMmFmMzUzOTg1NTJlZGIzMDEzODliNGUx ZWYyNWNmMmJjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA0LTExICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBNb3ZlIG1ldGEgbm9kZSBvdXQgb2Ygbm9kZXMgaW4gc25hcHNob3Qgc2VyaWFsaXphdGlv bi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNzAx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3RMb2FkZXIucHJvdG90eXBlLnB1c2hKU09OQ2h1bmspOgorCiAyMDEyLTA0LTEx ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IHNob3dpbmcgc3VtbWFyeSB2aWV3IGlzIHZlcnkgc2xvdyBvbiBhIHNuYXBzaG90 IHdpdGggdGhvdXNhbmRzIG9mIGNvbnN0cnVjdG9ycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3QuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcwppbmRleCA0OTAyNjFlZWM5ZmQwYzQ3 M2NjMzkxN2UyNzhjZDI2MWVhYjg4MjlkLi5hZmNiODk5YTY5ZGVjNmRkODZmMTMxNjBhYTVmOWJi MDExYjk2OTNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0hlYXBTbmFwc2hvdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0hlYXBTbmFwc2hvdC5qcwpAQCAtMTU1LDYgKzE1NSw4IEBAIFdlYkluc3BlY3Rvci5IZWFwU25h cHNob3RMb2FkZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKGNsb3NpbmdCcmFja2V0 SW5kZXggPT09IC0xKQogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIHRoaXMu X3NuYXBzaG90LnNuYXBzaG90ID0gSlNPTi5wYXJzZSh0aGlzLl9qc29uLnNsaWNlKDAsIGNsb3Np bmdCcmFja2V0SW5kZXgpKTsKKyAgICAgICAgICAgIHRoaXMuX3NuYXBzaG90Lm1ldGFOb2RlID0g dGhpcy5fc25hcHNob3Quc25hcHNob3QubWV0YTsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9z bmFwc2hvdC5zbmFwc2hvdC5tZXRhOwogICAgICAgICAgICAgdGhpcy5fanNvbiA9IHRoaXMuX2pz b24uc2xpY2UoY2xvc2luZ0JyYWNrZXRJbmRleCk7CiAgICAgICAgICAgICB0aGlzLl9zdGF0ZSA9 ICJmaW5kLW5vZGVzIjsKICAgICAgICAgICAgIHRoaXMucHVzaEpTT05DaHVuaygiIik7CkBAIC0x NjksNyArMTcxLDE1IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMb2FkZXIucHJvdG90eXBl ID0gewogICAgICAgICAgICAgaWYgKGJyYWNrZXRJbmRleCA9PT0gLTEpCiAgICAgICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICAgICAgdGhpcy5fanNvbiA9IHRoaXMuX2pzb24uc2xpY2UoYnJh Y2tldEluZGV4ICsgMSk7Ci0gICAgICAgICAgICB0aGlzLl9zdGF0ZSA9ICJwYXJzZS1ub2Rlcy1t ZXRhLWluZm8iOworICAgICAgICAgICAgaWYgKHRoaXMuX3NuYXBzaG90Lm1ldGFOb2RlKSB7Cisg ICAgICAgICAgICAgICAgdmFyIG5vZGVfZmllbGRzX2NvdW50ID0gdGhpcy5fc25hcHNob3QubWV0 YU5vZGUubm9kZV9maWVsZHMubGVuZ3RoOworICAgICAgICAgICAgICAgIHZhciBub2Rlc19sZW5n dGggPSB0aGlzLl9zbmFwc2hvdC5zbmFwc2hvdC5ub2RlX2NvdW50ICogbm9kZV9maWVsZHNfY291 bnQ7CisgICAgICAgICAgICAgICAgdGhpcy5fYXJyYXkgPSBuZXcgV2ViSW5zcGVjdG9yLlVpbnQz MkFycmF5KG5vZGVzX2xlbmd0aCk7CisgICAgICAgICAgICAgICAgdGhpcy5fc25hcHNob3QubWV0 YU5vZGUuc2VwYXJhdGVfZWRnZXMgPSB0cnVlOworICAgICAgICAgICAgICAgIHRoaXMuX3N0YXRl ID0gInBhcnNlLW5vZGVzIjsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAg dGhpcy5fc3RhdGUgPSAicGFyc2Utbm9kZXMtbWV0YS1pbmZvIjsKKyAgICAgICAgICAgIH0KICAg ICAgICAgICAgIHRoaXMucHVzaEpTT05DaHVuaygiIik7CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgfQpAQCAtMTgwLDggKzE5MCw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMb2Fk ZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fc25hcHNob3QubWV0YU5vZGUgPSBK U09OLnBhcnNlKHRoaXMuX2pzb24uc2xpY2UoMCwgY2xvc2luZ0JyYWNrZXRJbmRleCkpOwogICAg ICAgICAgICAgdGhpcy5fanNvbiA9IHRoaXMuX2pzb24uc2xpY2UoY2xvc2luZ0JyYWNrZXRJbmRl eCk7CiAgICAgICAgICAgICB0aGlzLl9hcnJheSA9IG5ldyBXZWJJbnNwZWN0b3IuVWludDMyQXJy YXkoKTsKLSAgICAgICAgICAgIGlmICghdGhpcy5fc25hcHNob3QubWV0YU5vZGUuc2VwYXJhdGVf ZWRnZXMpCi0gICAgICAgICAgICAgICAgdGhpcy5fYXJyYXkucHVzaCgwKTsKKyAgICAgICAgICAg IHRoaXMuX2FycmF5LnB1c2goMCk7CiAgICAgICAgICAgICB0aGlzLl9zdGF0ZSA9ICJwYXJzZS1u b2RlcyI7CiAgICAgICAgICAgICB0aGlzLnB1c2hKU09OQ2h1bmsoIiIpOwogICAgICAgICAgICAg YnJlYWs7CkBAIC0yMDksNyArMjE4LDkgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdExvYWRl ci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAoYnJhY2tldEluZGV4ID09PSAtMSkKICAg ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB0aGlzLl9qc29uID0gdGhpcy5fanNv bi5zbGljZShicmFja2V0SW5kZXggKyAxKTsKLSAgICAgICAgICAgIHRoaXMuX2FycmF5ID0gbmV3 IFdlYkluc3BlY3Rvci5VaW50MzJBcnJheSgpOworICAgICAgICAgICAgdmFyIGVkZ2VfZmllbGRz X2NvdW50ID0gdGhpcy5fc25hcHNob3QubWV0YU5vZGUuZWRnZV9maWVsZHMubGVuZ3RoOworICAg ICAgICAgICAgdmFyIGVkZ2VzX2xlbmd0aCA9IHRoaXMuX3NuYXBzaG90LnNuYXBzaG90LmVkZ2Vf Y291bnQgKiBlZGdlX2ZpZWxkc19jb3VudDsKKyAgICAgICAgICAgIHRoaXMuX2FycmF5ID0gbmV3 IFdlYkluc3BlY3Rvci5VaW50MzJBcnJheShlZGdlc19sZW5ndGgpOwogICAgICAgICAgICAgdGhp cy5fc3RhdGUgPSAicGFyc2UtZWRnZXMiOwogICAgICAgICAgICAgdGhpcy5wdXNoSlNPTkNodW5r KCIiKTsKICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDM3OGY2ZDMwMmJkMTFmODE0NzU4NjM4 YzUzMmQyMTMyODVjOTQ5ZDUuLjk2YjFkMTJlMWQ1NWYxNDg3N2ZmYmI4ODc3ZTc4ODdkNjkyM2Zk MDAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wNC0xMSAgQWxleGVpIEZpbGlwcG92ICA8 YWxleGVpZkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTW92ZSBtZXRh IG5vZGUgb3V0IG9mIG5vZGVzIGluIHNuYXBzaG90IHNlcmlhbGl6YXRpb24uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzcwMQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL3Byb2ZpbGVy L2hlYXAtc25hcHNob3QtdGVzdC5qczoKKyAgICAgICAgKGluaXRpYWxpemVfSGVhcFNuYXBzaG90 VGVzdC5JbnNwZWN0b3JUZXN0LmNyZWF0ZUhlYXBTbmFwc2hvdFNwbGl0Tm9kZXNFZGdlc01vY2tS YXcpOgorCiAyMDEyLTA0LTExICBTaW1vbiBQZW5hICA8c3BlbmFAaWdhbGlhLmNvbT4KIAogICAg ICAgICBbR1RLXSBtZWRpYS9ldmVudC1hdHRyaWJ1dGVzLmh0bWwgZmFpbHMKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9oZWFwLXNuYXBzaG90LXRlc3QuanMgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvaGVhcC1zbmFwc2hvdC10ZXN0LmpzCmluZGV4 IDEwZTE0Mzk2OTIyZjMyZGI1Y2MwOGEzYzY3ZDFjMmZkNTJlMWE1YTcuLjM3ZDVkOTM2ZmFhN2U5 YTgwNGM5MjY3MDJiZmJiMjJhYjY3YmM1MTcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9wcm9maWxlci9oZWFwLXNuYXBzaG90LXRlc3QuanMKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3QtdGVzdC5qcwpAQCAtNzgsMTUgKzc4LDE2IEBA IEluc3BlY3RvclRlc3QuY3JlYXRlSGVhcFNuYXBzaG90U3BsaXROb2Rlc0VkZ2VzTW9ja1JhdyA9 IGZ1bmN0aW9uKCkKICAgICAvLyBSZXR1cm4gdGhlIHNhbWUgc25hcHNob3QgYXMgYWJvdmUgYnV0 IGhhdmluZyB0aGUgbm9kZXMgYW5kIGVkZ2VzCiAgICAgLy8gc2VwYXJhdGVkLgogICAgIHJldHVy biB7Ci0gICAgICAgIHNuYXBzaG90OiB7fSwKLSAgICAgICAgbm9kZXM6IFsKLSAgICAgICAgICAg IHsKLSAgICAgICAgICAgICAgICBzZXBhcmF0ZV9lZGdlczogdHJ1ZSwKKyAgICAgICAgc25hcHNo b3Q6IHsKKyAgICAgICAgICAgIG1ldGE6IHsKICAgICAgICAgICAgICAgICBub2RlX2ZpZWxkczog WyJ0eXBlIiwgIm5hbWUiLCAiaWQiLCAic2VsZl9zaXplIiwgInJldGFpbmVkX3NpemUiLCAiZG9t aW5hdG9yIiwgImVkZ2VzX2luZGV4Il0sCiAgICAgICAgICAgICAgICAgbm9kZV90eXBlczogW1si aGlkZGVuIiwgIm9iamVjdCJdLCAiIiwgIiIsICIiLCAiIiwgIiIsICIiXSwKICAgICAgICAgICAg ICAgICBlZGdlX2ZpZWxkczogWyJ0eXBlIiwgIm5hbWVfb3JfaW5kZXgiLCAidG9fbm9kZSJdLAog ICAgICAgICAgICAgICAgIGVkZ2VfdHlwZXM6IFtbImVsZW1lbnQiLCAicHJvcGVydHkiXSwgIiIs ICIiXQogICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIG5vZGVfY291bnQ6IDYsCisgICAgICAg ICAgICBlZGdlX2NvdW50OiA3fSwKKyAgICAgICAgbm9kZXM6IFsKICAgICAgICAgICAgIDAsIDAs IDEsIDAsIDIwLCAgMCwgIDAsCiAgICAgICAgICAgICAxLCAxLCAyLCAyLCAgMiwgIDAsICA2LAog ICAgICAgICAgICAgMSwgMiwgMywgMywgIDgsICAwLCAxMiwK 136889 2012-04-12 06:05:37 -0700 2012-04-12 06:57:45 -0700 Patch bug-83701-20120412170535.patch text/plain 6293 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzODUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzkzNjA0MmE0NmVkMGZi ZTkwNTg4ZTQ3ZTIzNjNjNjAzZGViZWMxMS4uMjFlZTM0NmU3M2MzNzE1NTQyODczMjQ4NTA2Yjc0 MjlhNjVhYzI0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA0LTExICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBNb3ZlIG1ldGEgbm9kZSBvdXQgb2Ygbm9kZXMgaW4gc25hcHNob3Qgc2VyaWFsaXphdGlv bi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNzAx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3RMb2FkZXIucHJvdG90eXBlLnB1c2hKU09OQ2h1bmspOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkhlYXBTbmFwc2hvdCk6CisKIDIwMTItMDQtMTEgIFl1cnkgU2VtaWtoYXRza3kg IDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjogc2hvd2luZyBz dW1tYXJ5IHZpZXcgaXMgdmVyeSBzbG93IG9uIGEgc25hcHNob3Qgd2l0aCB0aG91c2FuZHMgb2Yg Y29uc3RydWN0b3JzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0hlYXBTbmFwc2hvdC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SGVhcFNuYXBzaG90LmpzCmluZGV4IDQ5MDI2MWVlYzlmZDBjNDczY2MzOTE3ZTI3OGNkMjYxZWFi ODgyOWQuLjg2Y2IxMDJkNWI4ZjY3ZWQ5NDdjMzcwYjMyZjM1OTUxNTZiNzIwMGEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90LmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90LmpzCkBA IC0xNjksNyArMTY5LDE1IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMb2FkZXIucHJvdG90 eXBlID0gewogICAgICAgICAgICAgaWYgKGJyYWNrZXRJbmRleCA9PT0gLTEpCiAgICAgICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICAgICAgdGhpcy5fanNvbiA9IHRoaXMuX2pzb24uc2xpY2Uo YnJhY2tldEluZGV4ICsgMSk7Ci0gICAgICAgICAgICB0aGlzLl9zdGF0ZSA9ICJwYXJzZS1ub2Rl cy1tZXRhLWluZm8iOworICAgICAgICAgICAgaWYgKHRoaXMuX3NuYXBzaG90LnNuYXBzaG90Lm1l dGEpIHsKKyAgICAgICAgICAgICAgICB2YXIgbm9kZV9maWVsZHNfY291bnQgPSB0aGlzLl9zbmFw c2hvdC5zbmFwc2hvdC5tZXRhLm5vZGVfZmllbGRzLmxlbmd0aDsKKyAgICAgICAgICAgICAgICB2 YXIgbm9kZXNfbGVuZ3RoID0gdGhpcy5fc25hcHNob3Quc25hcHNob3Qubm9kZV9jb3VudCAqIG5v ZGVfZmllbGRzX2NvdW50OworICAgICAgICAgICAgICAgIHRoaXMuX2FycmF5ID0gbmV3IFdlYklu c3BlY3Rvci5VaW50MzJBcnJheShub2Rlc19sZW5ndGgpOworICAgICAgICAgICAgICAgIHRoaXMu X3NuYXBzaG90LnNuYXBzaG90Lm1ldGEuc2VwYXJhdGVfZWRnZXMgPSB0cnVlOworICAgICAgICAg ICAgICAgIHRoaXMuX3N0YXRlID0gInBhcnNlLW5vZGVzIjsKKyAgICAgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICAgICAgdGhpcy5fc3RhdGUgPSAicGFyc2Utbm9kZXMtbWV0YS1pbmZvIjsK KyAgICAgICAgICAgIH0KICAgICAgICAgICAgIHRoaXMucHVzaEpTT05DaHVuaygiIik7CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgfQpAQCAtMTc3LDExICsxODUsMTAgQEAgV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdExvYWRlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIgY2xv c2luZ0JyYWNrZXRJbmRleCA9IHRoaXMuX2ZpbmRCYWxhbmNlZEN1cmx5QnJhY2tldHMoKTsKICAg ICAgICAgICAgIGlmIChjbG9zaW5nQnJhY2tldEluZGV4ID09PSAtMSkKICAgICAgICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgICAgICB0aGlzLl9zbmFwc2hvdC5tZXRhTm9kZSA9IEpTT04ucGFy c2UodGhpcy5fanNvbi5zbGljZSgwLCBjbG9zaW5nQnJhY2tldEluZGV4KSk7CisgICAgICAgICAg ICB0aGlzLl9zbmFwc2hvdC5zbmFwc2hvdC5tZXRhID0gSlNPTi5wYXJzZSh0aGlzLl9qc29uLnNs aWNlKDAsIGNsb3NpbmdCcmFja2V0SW5kZXgpKTsKICAgICAgICAgICAgIHRoaXMuX2pzb24gPSB0 aGlzLl9qc29uLnNsaWNlKGNsb3NpbmdCcmFja2V0SW5kZXgpOwogICAgICAgICAgICAgdGhpcy5f YXJyYXkgPSBuZXcgV2ViSW5zcGVjdG9yLlVpbnQzMkFycmF5KCk7Ci0gICAgICAgICAgICBpZiAo IXRoaXMuX3NuYXBzaG90Lm1ldGFOb2RlLnNlcGFyYXRlX2VkZ2VzKQotICAgICAgICAgICAgICAg IHRoaXMuX2FycmF5LnB1c2goMCk7CisgICAgICAgICAgICB0aGlzLl9hcnJheS5wdXNoKDApOwog ICAgICAgICAgICAgdGhpcy5fc3RhdGUgPSAicGFyc2Utbm9kZXMiOwogICAgICAgICAgICAgdGhp cy5wdXNoSlNPTkNodW5rKCIiKTsKICAgICAgICAgICAgIGJyZWFrOwpAQCAtMTg5LDcgKzE5Niw3 IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMb2FkZXIucHJvdG90eXBlID0gewogICAgICAg ICBjYXNlICJwYXJzZS1ub2RlcyI6IHsKICAgICAgICAgICAgIGlmICh0aGlzLl9wYXJzZVVpbnRB cnJheSgpKQogICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIGlmICh0aGlzLl9z bmFwc2hvdC5tZXRhTm9kZS5zZXBhcmF0ZV9lZGdlcykgeworICAgICAgICAgICAgaWYgKHRoaXMu X3NuYXBzaG90LnNuYXBzaG90Lm1ldGEuc2VwYXJhdGVfZWRnZXMpIHsKICAgICAgICAgICAgICAg ICB0aGlzLl9zbmFwc2hvdC5vbmx5Tm9kZXMgPSB0aGlzLl9hcnJheS5hcnJheTsKICAgICAgICAg ICAgICAgICB0aGlzLl9zdGF0ZSA9ICJmaW5kLWVkZ2VzIjsKICAgICAgICAgICAgIH0gZWxzZSB7 CkBAIC0yMDksNyArMjE2LDkgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdExvYWRlci5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAoYnJhY2tldEluZGV4ID09PSAtMSkKICAgICAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB0aGlzLl9qc29uID0gdGhpcy5fanNvbi5zbGlj ZShicmFja2V0SW5kZXggKyAxKTsKLSAgICAgICAgICAgIHRoaXMuX2FycmF5ID0gbmV3IFdlYklu c3BlY3Rvci5VaW50MzJBcnJheSgpOworICAgICAgICAgICAgdmFyIGVkZ2VfZmllbGRzX2NvdW50 ID0gdGhpcy5fc25hcHNob3Quc25hcHNob3QubWV0YS5lZGdlX2ZpZWxkcy5sZW5ndGg7CisgICAg ICAgICAgICB2YXIgZWRnZXNfbGVuZ3RoID0gdGhpcy5fc25hcHNob3Quc25hcHNob3QuZWRnZV9j b3VudCAqIGVkZ2VfZmllbGRzX2NvdW50OworICAgICAgICAgICAgdGhpcy5fYXJyYXkgPSBuZXcg V2ViSW5zcGVjdG9yLlVpbnQzMkFycmF5KGVkZ2VzX2xlbmd0aCk7CiAgICAgICAgICAgICB0aGlz Ll9zdGF0ZSA9ICJwYXJzZS1lZGdlcyI7CiAgICAgICAgICAgICB0aGlzLnB1c2hKU09OQ2h1bmso IiIpOwogICAgICAgICAgICAgYnJlYWs7CkBAIC03ODksNyArNzk4LDcgQEAgV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdCA9IGZ1bmN0aW9uKHByb2ZpbGUpCiAgICAgdGhpcy5fbm9kZXMgPSBwcm9m aWxlLm5vZGVzOwogICAgIHRoaXMuX29ubHlOb2RlcyA9IHByb2ZpbGUub25seU5vZGVzOwogICAg IHRoaXMuX2NvbnRhaW5tZW50RWRnZXMgPSBwcm9maWxlLmNvbnRhaW5tZW50RWRnZXM7Ci0gICAg dGhpcy5fbWV0YU5vZGUgPSBwcm9maWxlLm1ldGFOb2RlOworICAgIHRoaXMuX21ldGFOb2RlID0g cHJvZmlsZS5zbmFwc2hvdC5tZXRhOwogICAgIHRoaXMuX3N0cmluZ3MgPSBwcm9maWxlLnN0cmlu Z3M7CiAKICAgICB0aGlzLl9pbml0KCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzc4ZjZkMzAyYmQxMWY4MTQ3NTg2Mzhj NTMyZDIxMzI4NWM5NDlkNS4uOTZiMWQxMmUxZDU1ZjE0ODc3ZmZiYjg4NzdlNzg4N2Q2OTIzZmQw MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA0LTExICBBbGV4ZWkgRmlsaXBwb3YgIDxh bGV4ZWlmQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBNb3ZlIG1ldGEg bm9kZSBvdXQgb2Ygbm9kZXMgaW4gc25hcHNob3Qgc2VyaWFsaXphdGlvbi4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNzAxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvZmlsZXIv aGVhcC1zbmFwc2hvdC10ZXN0LmpzOgorICAgICAgICAoaW5pdGlhbGl6ZV9IZWFwU25hcHNob3RU ZXN0Lkluc3BlY3RvclRlc3QuY3JlYXRlSGVhcFNuYXBzaG90U3BsaXROb2Rlc0VkZ2VzTW9ja1Jh dyk6CisKIDIwMTItMDQtMTEgIFNpbW9uIFBlbmEgIDxzcGVuYUBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtHVEtdIG1lZGlhL2V2ZW50LWF0dHJpYnV0ZXMuaHRtbCBmYWlscwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3QtdGVzdC5qcyBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9oZWFwLXNuYXBzaG90LXRlc3QuanMKaW5kZXgg MTBlMTQzOTY5MjJmMzJkYjVjYzA4YTNjNjdkMWMyZmQ1MmUxYTVhNy4uZTBkMjVhY2Y5MGMwNDY4 ODk5Yjg4NmVjMDFmNjA1ZWZkYmY4NmYwMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3QtdGVzdC5qcworKysgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvcHJvZmlsZXIvaGVhcC1zbmFwc2hvdC10ZXN0LmpzCkBAIC03OCwxNSArNzgsMTYgQEAg SW5zcGVjdG9yVGVzdC5jcmVhdGVIZWFwU25hcHNob3RTcGxpdE5vZGVzRWRnZXNNb2NrUmF3ID0g ZnVuY3Rpb24oKQogICAgIC8vIFJldHVybiB0aGUgc2FtZSBzbmFwc2hvdCBhcyBhYm92ZSBidXQg aGF2aW5nIHRoZSBub2RlcyBhbmQgZWRnZXMKICAgICAvLyBzZXBhcmF0ZWQuCiAgICAgcmV0dXJu IHsKLSAgICAgICAgc25hcHNob3Q6IHt9LAotICAgICAgICBub2RlczogWwotICAgICAgICAgICAg ewotICAgICAgICAgICAgICAgIHNlcGFyYXRlX2VkZ2VzOiB0cnVlLAorICAgICAgICBzbmFwc2hv dDogeworICAgICAgICAgICAgbWV0YTogewogICAgICAgICAgICAgICAgIG5vZGVfZmllbGRzOiBb InR5cGUiLCAibmFtZSIsICJpZCIsICJzZWxmX3NpemUiLCAicmV0YWluZWRfc2l6ZSIsICJkb21p bmF0b3IiLCAiZWRnZXNfaW5kZXgiXSwKICAgICAgICAgICAgICAgICBub2RlX3R5cGVzOiBbWyJo aWRkZW4iLCAib2JqZWN0Il0sICIiLCAiIiwgIiIsICIiLCAiIiwgIiJdLAogICAgICAgICAgICAg ICAgIGVkZ2VfZmllbGRzOiBbInR5cGUiLCAibmFtZV9vcl9pbmRleCIsICJ0b19ub2RlIl0sCiAg ICAgICAgICAgICAgICAgZWRnZV90eXBlczogW1siZWxlbWVudCIsICJwcm9wZXJ0eSJdLCAiIiwg IiJdCiAgICAgICAgICAgICB9LAorICAgICAgICAgICAgbm9kZV9jb3VudDogNiwKKyAgICAgICAg ICAgIGVkZ2VfY291bnQ6IDd9LAorICAgICAgICBub2RlczogWwogICAgICAgICAgICAgMCwgMCwg MSwgMCwgMjAsICAwLCAgMCwKICAgICAgICAgICAgIDEsIDEsIDIsIDIsICAyLCAgMCwgIDYsCiAg ICAgICAgICAgICAxLCAyLCAzLCAzLCAgOCwgIDAsIDEyLApAQCAtMTA0LDcgKzEwNSw3IEBAIElu c3BlY3RvclRlc3QuY3JlYXRlSGVhcFNuYXBzaG90U3BsaXROb2Rlc0VkZ2VzTW9ja1JhdyA9IGZ1 bmN0aW9uKCkKIAogSW5zcGVjdG9yVGVzdC5fcG9zdHByb2Nlc3NIZWFwU25hcHNob3RNb2NrID0g ZnVuY3Rpb24obW9jaykKIHsKLSAgICBtb2NrLm1ldGFOb2RlID0gbW9jay5ub2Rlc1swXTsKKyAg ICBtb2NrLnNuYXBzaG90Lm1ldGEgPSBtb2NrLm5vZGVzWzBdOwogICAgIG1vY2subm9kZXNbMF0g PSAwOwogICAgIHZhciB0ZW1wTm9kZXMgPSBuZXcgSW50MzJBcnJheSgxMDAwKTsKICAgICB0ZW1w Tm9kZXMuc2V0KG1vY2subm9kZXMpOwo= 136899 2012-04-12 06:58:03 -0700 2012-04-12 08:57:36 -0700 Patch bug-83701-20120412175801.patch text/plain 6320 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzOTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmYwZTExZGNjZTczMmY1 ZTlmMzJmMDkyYWJjYTRkNDQ5MTQ2NDEwOS4uYTY0OWIyMjFjYWFjMWQyZDY0YmM1NTA0NzdmMzhm YWJkMTA3ODc0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA0LTExICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBNb3ZlIG1ldGEgbm9kZSBvdXQgb2Ygbm9kZXMgaW4gc25hcHNob3Qgc2VyaWFsaXphdGlv bi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNzAx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3RMb2FkZXIucHJvdG90eXBlLnB1c2hKU09OQ2h1bmspOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkhlYXBTbmFwc2hvdCk6CisKIDIwMTItMDQtMTIgIFNhbSBEICA8ZHNhbTI5MTJA Z21haWwuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5vZGUgVmFsdWUgc2hvdWxkIG5v dCBnZXQgY29ycnVwdCB3aGlsZSBqdW1wIG92ZXIgZGlmZmVyZW50IG1hdGNoZXMgaW4gc2VhcmNo LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25h cHNob3QuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hv dC5qcwppbmRleCAxMTAzNmExNjgzYThkYTkzZmQwMWE2OWMzNTc3ZTUyOTJkMmQyMGIzLi45NGQ4 YmY1NDUwOWUyNTJiNzk0NmYwNGM1NTk5NGViYmNmNGNhMjA2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcwpAQCAtMTc2LDcgKzE3 NiwxNSBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90TG9hZGVyLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIGlmIChicmFja2V0SW5kZXggPT09IC0xKQogICAgICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgICAgIHRoaXMuX2pzb24gPSB0aGlzLl9qc29uLnNsaWNlKGJyYWNrZXRJbmRl eCArIDEpOwotICAgICAgICAgICAgdGhpcy5fc3RhdGUgPSAicGFyc2Utbm9kZXMtbWV0YS1pbmZv IjsKKyAgICAgICAgICAgIGlmICh0aGlzLl9zbmFwc2hvdC5zbmFwc2hvdC5tZXRhKSB7CisgICAg ICAgICAgICAgICAgdmFyIG5vZGVfZmllbGRzX2NvdW50ID0gdGhpcy5fc25hcHNob3Quc25hcHNo b3QubWV0YS5ub2RlX2ZpZWxkcy5sZW5ndGg7CisgICAgICAgICAgICAgICAgdmFyIG5vZGVzX2xl bmd0aCA9IHRoaXMuX3NuYXBzaG90LnNuYXBzaG90Lm5vZGVfY291bnQgKiBub2RlX2ZpZWxkc19j b3VudDsKKyAgICAgICAgICAgICAgICB0aGlzLl9hcnJheSA9IG5ldyBXZWJJbnNwZWN0b3IuVWlu dDMyQXJyYXkobm9kZXNfbGVuZ3RoKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9zbmFwc2hvdC5z bmFwc2hvdC5tZXRhLnNlcGFyYXRlX2VkZ2VzID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICB0aGlz Ll9zdGF0ZSA9ICJwYXJzZS1ub2RlcyI7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgICAgIHRoaXMuX3N0YXRlID0gInBhcnNlLW5vZGVzLW1ldGEtaW5mbyI7CisgICAgICAgICAg ICB9CiAgICAgICAgICAgICB0aGlzLnB1c2hKU09OQ2h1bmsoIiIpOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KQEAgLTE4NCwxMSArMTkyLDEwIEBAIFdlYkluc3BlY3Rvci5IZWFwU25h cHNob3RMb2FkZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIGNsb3NpbmdCcmFja2V0 SW5kZXggPSB0aGlzLl9maW5kQmFsYW5jZWRDdXJseUJyYWNrZXRzKCk7CiAgICAgICAgICAgICBp ZiAoY2xvc2luZ0JyYWNrZXRJbmRleCA9PT0gLTEpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwot ICAgICAgICAgICAgdGhpcy5fc25hcHNob3QubWV0YU5vZGUgPSBKU09OLnBhcnNlKHRoaXMuX2pz b24uc2xpY2UoMCwgY2xvc2luZ0JyYWNrZXRJbmRleCkpOworICAgICAgICAgICAgdGhpcy5fc25h cHNob3Quc25hcHNob3QubWV0YSA9IEpTT04ucGFyc2UodGhpcy5fanNvbi5zbGljZSgwLCBjbG9z aW5nQnJhY2tldEluZGV4KSk7CiAgICAgICAgICAgICB0aGlzLl9qc29uID0gdGhpcy5fanNvbi5z bGljZShjbG9zaW5nQnJhY2tldEluZGV4KTsKICAgICAgICAgICAgIHRoaXMuX2FycmF5ID0gbmV3 IFdlYkluc3BlY3Rvci5VaW50MzJBcnJheSgpOwotICAgICAgICAgICAgaWYgKCF0aGlzLl9zbmFw c2hvdC5tZXRhTm9kZS5zZXBhcmF0ZV9lZGdlcykKLSAgICAgICAgICAgICAgICB0aGlzLl9hcnJh eS5wdXNoKDApOworICAgICAgICAgICAgdGhpcy5fYXJyYXkucHVzaCgwKTsKICAgICAgICAgICAg IHRoaXMuX3N0YXRlID0gInBhcnNlLW5vZGVzIjsKICAgICAgICAgICAgIHRoaXMucHVzaEpTT05D aHVuaygiIik7CiAgICAgICAgICAgICBicmVhazsKQEAgLTE5Niw3ICsyMDMsNyBAQCBXZWJJbnNw ZWN0b3IuSGVhcFNuYXBzaG90TG9hZGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgY2FzZSAicGFy c2Utbm9kZXMiOiB7CiAgICAgICAgICAgICBpZiAodGhpcy5fcGFyc2VVaW50QXJyYXkoKSkKICAg ICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICBpZiAodGhpcy5fc25hcHNob3QubWV0 YU5vZGUuc2VwYXJhdGVfZWRnZXMpIHsKKyAgICAgICAgICAgIGlmICh0aGlzLl9zbmFwc2hvdC5z bmFwc2hvdC5tZXRhLnNlcGFyYXRlX2VkZ2VzKSB7CiAgICAgICAgICAgICAgICAgdGhpcy5fc25h cHNob3Qub25seU5vZGVzID0gdGhpcy5fYXJyYXkuYXJyYXk7CiAgICAgICAgICAgICAgICAgdGhp cy5fc3RhdGUgPSAiZmluZC1lZGdlcyI7CiAgICAgICAgICAgICB9IGVsc2UgewpAQCAtMjE2LDcg KzIyMyw5IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMb2FkZXIucHJvdG90eXBlID0gewog ICAgICAgICAgICAgaWYgKGJyYWNrZXRJbmRleCA9PT0gLTEpCiAgICAgICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICAgICAgdGhpcy5fanNvbiA9IHRoaXMuX2pzb24uc2xpY2UoYnJhY2tldElu ZGV4ICsgMSk7Ci0gICAgICAgICAgICB0aGlzLl9hcnJheSA9IG5ldyBXZWJJbnNwZWN0b3IuVWlu dDMyQXJyYXkoKTsKKyAgICAgICAgICAgIHZhciBlZGdlX2ZpZWxkc19jb3VudCA9IHRoaXMuX3Nu YXBzaG90LnNuYXBzaG90Lm1ldGEuZWRnZV9maWVsZHMubGVuZ3RoOworICAgICAgICAgICAgdmFy IGVkZ2VzX2xlbmd0aCA9IHRoaXMuX3NuYXBzaG90LnNuYXBzaG90LmVkZ2VfY291bnQgKiBlZGdl X2ZpZWxkc19jb3VudDsKKyAgICAgICAgICAgIHRoaXMuX2FycmF5ID0gbmV3IFdlYkluc3BlY3Rv ci5VaW50MzJBcnJheShlZGdlc19sZW5ndGgpOwogICAgICAgICAgICAgdGhpcy5fc3RhdGUgPSAi cGFyc2UtZWRnZXMiOwogICAgICAgICAgICAgdGhpcy5wdXNoSlNPTkNodW5rKCIiKTsKICAgICAg ICAgICAgIGJyZWFrOwpAQCAtODIzLDcgKzgzMiw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNo b3QgPSBmdW5jdGlvbihwcm9maWxlKQogICAgIHRoaXMuX29ubHlOb2RlcyA9IHByb2ZpbGUub25s eU5vZGVzOwogICAgIHRoaXMuX2NvbnRhaW5tZW50RWRnZXMgPSBwcm9maWxlLmNvbnRhaW5tZW50 RWRnZXM7CiAgICAgLyoqIEB0eXBle0hlYXBTbmFwc2hvdE1ldGFpbmZvfSAqLwotICAgIHRoaXMu X21ldGFOb2RlID0gcHJvZmlsZS5tZXRhTm9kZTsKKyAgICB0aGlzLl9tZXRhTm9kZSA9IHByb2Zp bGUuc25hcHNob3QubWV0YTsKICAgICB0aGlzLl9zdHJpbmdzID0gcHJvZmlsZS5zdHJpbmdzOwog CiAgICAgdGhpcy5faW5pdCgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDQ5ODc4YjIyZTkxOWFkYjQ2Y2ViZTdiZGVhZDNl MDBkNTEwZjMwZTguLjRkOTk5NDU3NWFkMWUzYzVkZTgyYzQ3NTJkYzFlZmExM2Q4MDVmMzkgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wNC0xMSAgQWxleGVpIEZpbGlwcG92ICA8YWxleGVp ZkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTW92ZSBtZXRhIG5vZGUg b3V0IG9mIG5vZGVzIGluIHNuYXBzaG90IHNlcmlhbGl6YXRpb24uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzcwMQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAt c25hcHNob3QtdGVzdC5qczoKKyAgICAgICAgKGluaXRpYWxpemVfSGVhcFNuYXBzaG90VGVzdC5J bnNwZWN0b3JUZXN0LmNyZWF0ZUhlYXBTbmFwc2hvdFNwbGl0Tm9kZXNFZGdlc01vY2tSYXcpOgor CiAyMDEyLTA0LTEyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IGV4dHJhY3RpbmcgTmV0d29ya1JlcXVlc3QgZnJvbSBSZXNv dXJjZSAoc3RlcCAyKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVy L2hlYXAtc25hcHNob3QtdGVzdC5qcyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9o ZWFwLXNuYXBzaG90LXRlc3QuanMKaW5kZXggMTBlMTQzOTY5MjJmMzJkYjVjYzA4YTNjNjdkMWMy ZmQ1MmUxYTVhNy4uZTBkMjVhY2Y5MGMwNDY4ODk5Yjg4NmVjMDFmNjA1ZWZkYmY4NmYwMiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3QtdGVz dC5qcworKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvaGVhcC1zbmFwc2hvdC10 ZXN0LmpzCkBAIC03OCwxNSArNzgsMTYgQEAgSW5zcGVjdG9yVGVzdC5jcmVhdGVIZWFwU25hcHNo b3RTcGxpdE5vZGVzRWRnZXNNb2NrUmF3ID0gZnVuY3Rpb24oKQogICAgIC8vIFJldHVybiB0aGUg c2FtZSBzbmFwc2hvdCBhcyBhYm92ZSBidXQgaGF2aW5nIHRoZSBub2RlcyBhbmQgZWRnZXMKICAg ICAvLyBzZXBhcmF0ZWQuCiAgICAgcmV0dXJuIHsKLSAgICAgICAgc25hcHNob3Q6IHt9LAotICAg ICAgICBub2RlczogWwotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHNlcGFyYXRlX2Vk Z2VzOiB0cnVlLAorICAgICAgICBzbmFwc2hvdDogeworICAgICAgICAgICAgbWV0YTogewogICAg ICAgICAgICAgICAgIG5vZGVfZmllbGRzOiBbInR5cGUiLCAibmFtZSIsICJpZCIsICJzZWxmX3Np emUiLCAicmV0YWluZWRfc2l6ZSIsICJkb21pbmF0b3IiLCAiZWRnZXNfaW5kZXgiXSwKICAgICAg ICAgICAgICAgICBub2RlX3R5cGVzOiBbWyJoaWRkZW4iLCAib2JqZWN0Il0sICIiLCAiIiwgIiIs ICIiLCAiIiwgIiJdLAogICAgICAgICAgICAgICAgIGVkZ2VfZmllbGRzOiBbInR5cGUiLCAibmFt ZV9vcl9pbmRleCIsICJ0b19ub2RlIl0sCiAgICAgICAgICAgICAgICAgZWRnZV90eXBlczogW1si ZWxlbWVudCIsICJwcm9wZXJ0eSJdLCAiIiwgIiJdCiAgICAgICAgICAgICB9LAorICAgICAgICAg ICAgbm9kZV9jb3VudDogNiwKKyAgICAgICAgICAgIGVkZ2VfY291bnQ6IDd9LAorICAgICAgICBu b2RlczogWwogICAgICAgICAgICAgMCwgMCwgMSwgMCwgMjAsICAwLCAgMCwKICAgICAgICAgICAg IDEsIDEsIDIsIDIsICAyLCAgMCwgIDYsCiAgICAgICAgICAgICAxLCAyLCAzLCAzLCAgOCwgIDAs IDEyLApAQCAtMTA0LDcgKzEwNSw3IEBAIEluc3BlY3RvclRlc3QuY3JlYXRlSGVhcFNuYXBzaG90 U3BsaXROb2Rlc0VkZ2VzTW9ja1JhdyA9IGZ1bmN0aW9uKCkKIAogSW5zcGVjdG9yVGVzdC5fcG9z dHByb2Nlc3NIZWFwU25hcHNob3RNb2NrID0gZnVuY3Rpb24obW9jaykKIHsKLSAgICBtb2NrLm1l dGFOb2RlID0gbW9jay5ub2Rlc1swXTsKKyAgICBtb2NrLnNuYXBzaG90Lm1ldGEgPSBtb2NrLm5v ZGVzWzBdOwogICAgIG1vY2subm9kZXNbMF0gPSAwOwogICAgIHZhciB0ZW1wTm9kZXMgPSBuZXcg SW50MzJBcnJheSgxMDAwKTsKICAgICB0ZW1wTm9kZXMuc2V0KG1vY2subm9kZXMpOwo=