46724 2010-09-28 08:08:36 -0700 Web Inspector: move pauseOnExceptionState under control of InspectorState 2010-09-29 01:00:43 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo loislo bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 286239 0 loislo 2010-09-28 08:08:36 -0700 %subj% 286249 1 69053 loislo 2010-09-28 08:15:16 -0700 Created attachment 69053 [patch] initial version. 286370 2 69053 yurys 2010-09-28 10:51:25 -0700 Comment on attachment 69053 [patch] initial version. View in context: https://bugs.webkit.org/attachment.cgi?id=69053&action=review > WebCore/inspector/InspectorController.cpp:263 > + (*state)->setNumber(pauseOnExceptionsStateStateName, ScriptDebugServer::shared().pauseOnExceptionsState()); This is the only usage of ScriptDebugServer left in the IC, I should have removed when I was extracting InspectorDebuggerAgent. Could you move this accessor into Inspector debugger agent and check here if the agent is present, it should cover both cases of debugger always enabled and debugger enabled manually. > WebCore/inspector/front-end/inspector.js:595 > + if ("updatePauseOnExceptionsState" in inspectorState) you check for presence of one name but then access another field 286491 3 69093 loislo 2010-09-28 13:20:37 -0700 Created attachment 69093 [patch] second iteration comments addressed 286751 4 69093 yurys 2010-09-28 23:47:35 -0700 Comment on attachment 69093 [patch] second iteration View in context: https://bugs.webkit.org/attachment.cgi?id=69093&action=review > WebCore/inspector/InspectorController.cpp:264 > + (*state)->setNumber(pauseOnExceptionsStateStateName, m_debuggerAgent->pauseOnExceptionsState()); Now we can remove #include "ScriptDebugServer.h". Please do this before landing. 286768 5 loislo 2010-09-29 01:00:43 -0700 Committed r68635 M WebCore/ChangeLog M WebCore/inspector/InspectorDebuggerAgent.h M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorDebuggerAgent.cpp M WebCore/inspector/Inspector.idl M WebCore/inspector/front-end/ScriptsPanel.js M WebCore/inspector/front-end/inspector.js r68635 = b05398cb12412b6f9b65099ae5f5526aab37c5a0 (refs/remotes/trunk) 69053 2010-09-28 08:15:16 -0700 2010-09-28 13:20:37 -0700 [patch] initial version. patch text/plain 7668 loislo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDEzNGUzZi4uZTNjNTE2ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMC0wOS0yOCAgSWx5YSBUaWtob25v dnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbW92ZSBwYXVzZU9uRXhjZXB0aW9u U3RhdGUgdW5kZXIgY29udHJvbCBvZiBJbnNwZWN0b3JTdGF0ZQorICAgICAgICBJdCBpcyBJbnNw ZWN0b3IgUHJvdG9jb2wgY2xlYW51cCBhY3Rpdml0eS4KKyAgICAgICAgVGhlIGFjdHVhbCBzdGF0 ZSBvZiB0aGlzIGZsYWcgY2FuIGJlIG9idGFpbmVkIGFzIGEgcmV0dXJuIHZhbHVlIG9mIHNldFBh dXNlT25FeGNlcHRpb25TdGF0ZSBjb21tYW5kCisgICAgICAgIG9yIGFzIGEgdmFsdWUgaW4gSW5z cGVjdG9yU3RhdGUgb2JqZWN0LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00NjcyNAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5pZGw6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6Z2V0SW5zcGVjdG9yU3RhdGUpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmplY3RzKToK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzZXRQYXVzZU9uRXhjZXB0aW9uc1N0 YXRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3RvZ2dsZVBhdXNlT25FeGNlcHRpb25z KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5kb0xvYWRlZERvbmUucG9wdWxhdGVJbnNwZWN0b3JTdGF0ZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuZG9Mb2FkZWREb25lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5y ZXBvcnRQcm90b2NvbEVycm9yKToKKwogMjAxMC0wOS0yNyAgS2VudCBUYW11cmEgIDx0a2VudEBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3IuaWRsCmluZGV4IGNlMmIwM2YuLmEwOGE2MjIgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yLmlkbApAQCAtMTMwLDcgKzEzMCw3IEBAIG1vZHVsZSBjb3JlIHsKICAgICAgICAg W2hhbmRsZXI9RGVidWddIHZvaWQgc3RlcEludG9TdGF0ZW1lbnQoKTsKICAgICAgICAgW2hhbmRs ZXI9RGVidWddIHZvaWQgc3RlcE91dE9mRnVuY3Rpb24oKTsKIAotICAgICAgICBbaGFuZGxlcj1E ZWJ1Z10gdm9pZCBzZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKGluIGxvbmcgcGF1c2VPbkV4Y2Vw dGlvbnNTdGF0ZSk7CisgICAgICAgIFtoYW5kbGVyPURlYnVnXSB2b2lkIHNldFBhdXNlT25FeGNl cHRpb25zU3RhdGUoaW4gbG9uZyBwYXVzZU9uRXhjZXB0aW9uc1N0YXRlLCBvdXQgbG9uZyBuZXdT dGF0ZSk7CiAKICAgICAgICAgW2hhbmRsZXI9RGVidWddIHZvaWQgZWRpdFNjcmlwdFNvdXJjZShp biBTdHJpbmcgc291cmNlSUQsIGluIFN0cmluZyBuZXdDb250ZW50LCBvdXQgYm9vbGVhbiBzdWNj ZXNzLCBvdXQgU3RyaW5nIHJlc3VsdCwgb3V0IFZhbHVlIG5ld0NhbGxGcmFtZXMpOwogICAgICAg ICBbaGFuZGxlcj1EZWJ1Z10gdm9pZCBnZXRTY3JpcHRTb3VyY2UoaW4gU3RyaW5nIHNvdXJjZUlE LCBvdXQgU3RyaW5nIHNjcmlwdFNvdXJjZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwCmluZGV4IGQxMDZkNTYuLmYxMTcyZDAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC0xMzEsNiArMTMxLDcgQEAgc3RhdGljIGNvbnN0 IGNoYXIqIGNvbnN0IG1vbml0b3JpbmdYSFJTdGF0ZU5hbWUgPSAibW9uaXRvcmluZ1hIUkVuYWJs ZWQiOwogc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0IHJlc291cmNlVHJhY2tpbmdFbmFibGVkU3Rh dGVOYW1lID0gInJlc291cmNlVHJhY2tpbmdFbmFibGVkIjsKIHN0YXRpYyBjb25zdCBjaGFyKiBj b25zdCBzZWFyY2hpbmdGb3JOb2RlRW5hYmxlZFN0YXRlTmFtZSA9ICJzZWFyY2hpbmdGb3JOb2Rl RW5hYmxlZCI7CiBzdGF0aWMgY29uc3QgY2hhciogY29uc3QgdGltZWxpbmVQcm9maWxlckVuYWJs ZWRTdGF0ZU5hbWUgPSAidGltZWxpbmVQcm9maWxlckVuYWJsZWQiOworc3RhdGljIGNvbnN0IGNo YXIqIGNvbnN0IHBhdXNlT25FeGNlcHRpb25zU3RhdGVTdGF0ZU5hbWUgPSAicGF1c2VPbkV4Y2Vw dGlvbnNTdGF0ZSI7CiAKIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBpbnNwZWN0b3JBdHRhY2hl ZEhlaWdodE5hbWUgPSAiaW5zcGVjdG9yQXR0YWNoZWRIZWlnaHQiOwogCkBAIC0yNTgsNiArMjU5 LDkgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpnZXRJbnNwZWN0b3JTdGF0ZShSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0Piogc3RhdGUpCiB7CiAgICAgKCpzdGF0ZSktPnNldEJvb2xlYW4obW9u aXRvcmluZ1hIUlN0YXRlTmFtZSwgbV9tb25pdG9yaW5nWEhSKTsKICAgICAoKnN0YXRlKS0+c2V0 Qm9vbGVhbihyZXNvdXJjZVRyYWNraW5nRW5hYmxlZFN0YXRlTmFtZSwgbV9yZXNvdXJjZVRyYWNr aW5nRW5hYmxlZCk7CisjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCisgICAgKCpzdGF0 ZSktPnNldE51bWJlcihwYXVzZU9uRXhjZXB0aW9uc1N0YXRlU3RhdGVOYW1lLCBTY3JpcHREZWJ1 Z1NlcnZlcjo6c2hhcmVkKCkucGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSgpKTsKKyNlbmRpZgogfQog CiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnVwZGF0ZUluc3BlY3RvclN0YXRlQ29va2llKCkK QEAgLTY3NSwxMCArNjc5LDYgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpwb3B1bGF0ZVNj cmlwdE9iamVjdHMoKQogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtZXNzYWdlQ291bnQ7 ICsraSkKICAgICAgICAgbV9jb25zb2xlTWVzc2FnZXNbaV0tPmFkZFRvRnJvbnRlbmQobV9mcm9u dGVuZC5nZXQoKSwgbV9pbmplY3RlZFNjcmlwdEhvc3QuZ2V0KCkpOwogCi0jaWYgRU5BQkxFKEpB VkFTQ1JJUFRfREVCVUdHRVIpCi0gICAgaWYgKGRlYnVnZ2VyRW5hYmxlZCgpKQotICAgICAgICBt X2Zyb250ZW5kLT51cGRhdGVQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKFNjcmlwdERlYnVnU2VydmVy OjpzaGFyZWQoKS5wYXVzZU9uRXhjZXB0aW9uc1N0YXRlKCkpOwotI2VuZGlmCiAjaWYgRU5BQkxF KERBVEFCQVNFKQogICAgIERhdGFiYXNlUmVzb3VyY2VzTWFwOjppdGVyYXRvciBkYXRhYmFzZXNF bmQgPSBtX2RhdGFiYXNlUmVzb3VyY2VzLmVuZCgpOwogICAgIGZvciAoRGF0YWJhc2VSZXNvdXJj ZXNNYXA6Oml0ZXJhdG9yIGl0ID0gbV9kYXRhYmFzZVJlc291cmNlcy5iZWdpbigpOyBpdCAhPSBk YXRhYmFzZXNFbmQ7ICsraXQpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JEZWJ1Z2dlckFnZW50LmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2Vy QWdlbnQuY3BwCmluZGV4IDkyNzU5NjEuLmI3YzhmOTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCkBAIC0xNzIsMTAgKzE3MiwxMCBAQCB2b2lkIElu c3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnN0ZXBPdXRPZkZ1bmN0aW9uKCkKICAgICBTY3JpcHREZWJ1 Z1NlcnZlcjo6c2hhcmVkKCkuc3RlcE91dE9mRnVuY3Rpb24oKTsKIH0KIAotdm9pZCBJbnNwZWN0 b3JEZWJ1Z2dlckFnZW50OjpzZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKGxvbmcgcGF1c2VTdGF0 ZSkKK3ZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0UGF1c2VPbkV4Y2VwdGlvbnNTdGF0 ZShsb25nIHBhdXNlU3RhdGUsIGxvbmcqIG5ld1N0YXRlKQogewogICAgIFNjcmlwdERlYnVnU2Vy dmVyOjpzaGFyZWQoKS5zZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKHN0YXRpY19jYXN0PFNjcmlw dERlYnVnU2VydmVyOjpQYXVzZU9uRXhjZXB0aW9uc1N0YXRlPihwYXVzZVN0YXRlKSk7Ci0gICAg bV9mcm9udGVuZC0+dXBkYXRlUGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZShTY3JpcHREZWJ1Z1NlcnZl cjo6c2hhcmVkKCkucGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSgpKTsKKyAgICAqbmV3U3RhdGUgPSBT Y3JpcHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCkucGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSgpOwogfQog CiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmNsZWFyRm9yUGFnZU5hdmlnYXRpb24oKQpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oIGIv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCmluZGV4IGY1YmFhYmMu LjdmNjQwZDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2Vy QWdlbnQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgK QEAgLTczLDcgKzczLDcgQEAgcHVibGljOgogICAgIHZvaWQgc3RlcEludG9TdGF0ZW1lbnQoKTsK ICAgICB2b2lkIHN0ZXBPdXRPZkZ1bmN0aW9uKCk7CiAKLSAgICB2b2lkIHNldFBhdXNlT25FeGNl cHRpb25zU3RhdGUobG9uZyBwYXVzZVN0YXRlKTsKKyAgICB2b2lkIHNldFBhdXNlT25FeGNlcHRp b25zU3RhdGUobG9uZyBwYXVzZVN0YXRlLCBsb25nKiBuZXdTdGF0ZSk7CiAKICAgICB2b2lkIGNs ZWFyRm9yUGFnZU5hdmlnYXRpb24oKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanMKaW5kZXggYjgyYjk5Ni4uODI4MzUyOCAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC04OTUsNyArODk1LDcgQEAgV2ViSW5z cGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBfdG9nZ2xlUGF1c2VPbkV4 Y2VwdGlvbnM6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIEluc3BlY3RvckJhY2tlbmQuc2V0 UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSgodGhpcy5fcGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi5zdGF0 ZSArIDEpICUgdGhpcy5fcGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi5zdGF0ZXMpOworICAgICAgICBJ bnNwZWN0b3JCYWNrZW5kLnNldFBhdXNlT25FeGNlcHRpb25zU3RhdGUoKHRoaXMuX3BhdXNlT25F eGNlcHRpb25CdXR0b24uc3RhdGUgKyAxKSAlIHRoaXMuX3BhdXNlT25FeGNlcHRpb25CdXR0b24u c3RhdGVzLCB0aGlzLnVwZGF0ZVBhdXNlT25FeGNlcHRpb25zU3RhdGUuYmluZCh0aGlzKSk7CiAg ICAgfSwKIAogICAgIF90b2dnbGVQYXVzZTogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggZmUwMmNmNC4uZTI5MjYzMyAxMDA2NDQKLS0tIGEv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC01OTIsNiArNTkyLDggQEAgV2ViSW5z cGVjdG9yLmRvTG9hZGVkRG9uZSA9IGZ1bmN0aW9uKCkKICAgICBmdW5jdGlvbiBwb3B1bGF0ZUlu c3BlY3RvclN0YXRlKGluc3BlY3RvclN0YXRlKQogICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9y Lm1vbml0b3JpbmdYSFJFbmFibGVkID0gaW5zcGVjdG9yU3RhdGUubW9uaXRvcmluZ1hIUkVuYWJs ZWQ7CisgICAgICAgIGlmICgidXBkYXRlUGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSIgaW4gaW5zcGVj dG9yU3RhdGUpCisgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMudXBkYXRl UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZShpbnNwZWN0b3JTdGF0ZS5wYXVzZU9uRXhjZXB0aW9uc1N0 YXRlKTsKICAgICAgICAgaWYgKGluc3BlY3RvclN0YXRlLnJlc291cmNlVHJhY2tpbmdFbmFibGVk KQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMucmVzb3VyY2VUcmFj a2luZ1dhc0VuYWJsZWQoKTsKICAgICAgICAgZWxzZQpAQCAtNjg0LDggKzY4Niw4IEBAIFdlYklu c3BlY3Rvci5kaXNwYXRjaE1lc3NhZ2VGcm9tQmFja2VuZCA9IGZ1bmN0aW9uKG1lc3NhZ2VPYmpl Y3QpCiBXZWJJbnNwZWN0b3IucmVwb3J0UHJvdG9jb2xFcnJvciA9IGZ1bmN0aW9uKG1lc3NhZ2VP YmplY3QpCiB7CiAgICAgY29uc29sZS5lcnJvcigiUHJvdG9jb2wgRXJyb3I6IEluc3BlY3RvckJh Y2tlbmQgcmVxdWVzdCB3aXRoIHNlcSA9ICVkIGZhaWxlZC4iLCBtZXNzYWdlT2JqZWN0LnNlcSk7 Ci0gICAgZm9yICh2YXIgZXJyb3IgaW4gbWVzc2FnZU9iamVjdC5lcnJvcnMpCi0gICAgICAgIGNv bnNvbGUuZXJyb3IoIiAgICAiICsgZXJyb3IpOworICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbWVz c2FnZU9iamVjdC5lcnJvcnMubGVuZ3RoOyArK2kpCisgICAgICAgIGNvbnNvbGUuZXJyb3IoIiAg ICAiICsgbWVzc2FnZU9iamVjdC5lcnJvcnNbaV0pOwogICAgIFdlYkluc3BlY3Rvci5yZW1vdmVS ZXNwb25zZUNhbGxiYWNrRW50cnkobWVzc2FnZU9iamVjdC5zZXEpOwogfQogCkBAIC0xNDA5LDEx ICsxNDExLDYgQEAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyV2FzRW5hYmxlZCA9IGZ1bmN0aW9uKCkK ICAgICB0aGlzLnBhbmVscy5zY3JpcHRzLmRlYnVnZ2VyV2FzRW5hYmxlZCgpOwogfQogCi1XZWJJ bnNwZWN0b3IudXBkYXRlUGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSA9IGZ1bmN0aW9uKHBhdXNlT25F eGNlcHRpb25zU3RhdGUpCi17Ci0gICAgdGhpcy5wYW5lbHMuc2NyaXB0cy51cGRhdGVQYXVzZU9u RXhjZXB0aW9uc1N0YXRlKHBhdXNlT25FeGNlcHRpb25zU3RhdGUpOwotfQotCiBXZWJJbnNwZWN0 b3IuZGVidWdnZXJXYXNEaXNhYmxlZCA9IGZ1bmN0aW9uKCkKIHsKICAgICB0aGlzLnBhbmVscy5z Y3JpcHRzLmRlYnVnZ2VyV2FzRGlzYWJsZWQoKTsK 69093 2010-09-28 13:20:37 -0700 2010-09-28 23:47:35 -0700 [patch] second iteration patch text/plain 7929 loislo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWQ2Mzg4My4uNDhmMDBjNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0wOS0yOCAgSWx5YSBUaWtob25v dnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbW92ZSBwYXVzZU9uRXhjZXB0aW9u U3RhdGUgdW5kZXIgY29udHJvbCBvZiBJbnNwZWN0b3JTdGF0ZQorICAgICAgICBJdCBpcyBJbnNw ZWN0b3IgUHJvdG9jb2wgY2xlYW51cCBhY3Rpdml0eS4KKyAgICAgICAgVGhlIGFjdHVhbCBzdGF0 ZSBvZiB0aGlzIGZsYWcgY2FuIGJlIG9idGFpbmVkIGFzIGEgcmV0dXJuIHZhbHVlIG9mIHNldFBh dXNlT25FeGNlcHRpb25TdGF0ZSBjb21tYW5kCisgICAgICAgIG9yIGFzIGEgdmFsdWUgaW4gSW5z cGVjdG9yU3RhdGUgb2JqZWN0LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00NjcyNAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5pZGw6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6Z2V0SW5zcGVjdG9yU3RhdGUpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmplY3RzKToK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzZXRQYXVzZU9uRXhjZXB0aW9uc1N0 YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnBhdXNlT25F eGNlcHRpb25zU3RhdGUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFn ZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fdG9nZ2xlUGF1c2VP bkV4Y2VwdGlvbnMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLmRvTG9hZGVkRG9uZS5wb3B1bGF0ZUluc3BlY3RvclN0 YXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5kb0xvYWRlZERvbmUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLnJlcG9ydFByb3RvY29sRXJyb3IpOgorCiAyMDEwLTA5LTI4ICBBbmRyZWFzIEts aW5nICA8YW5kcmVhcy5rbGluZ0Bub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2Vu bmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3IuaWRsIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbAppbmRleCBjZTJi MDNmLi5hMDhhNjIyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRs CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKQEAgLTEzMCw3ICsxMzAsNyBA QCBtb2R1bGUgY29yZSB7CiAgICAgICAgIFtoYW5kbGVyPURlYnVnXSB2b2lkIHN0ZXBJbnRvU3Rh dGVtZW50KCk7CiAgICAgICAgIFtoYW5kbGVyPURlYnVnXSB2b2lkIHN0ZXBPdXRPZkZ1bmN0aW9u KCk7CiAKLSAgICAgICAgW2hhbmRsZXI9RGVidWddIHZvaWQgc2V0UGF1c2VPbkV4Y2VwdGlvbnNT dGF0ZShpbiBsb25nIHBhdXNlT25FeGNlcHRpb25zU3RhdGUpOworICAgICAgICBbaGFuZGxlcj1E ZWJ1Z10gdm9pZCBzZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKGluIGxvbmcgcGF1c2VPbkV4Y2Vw dGlvbnNTdGF0ZSwgb3V0IGxvbmcgbmV3U3RhdGUpOwogCiAgICAgICAgIFtoYW5kbGVyPURlYnVn XSB2b2lkIGVkaXRTY3JpcHRTb3VyY2UoaW4gU3RyaW5nIHNvdXJjZUlELCBpbiBTdHJpbmcgbmV3 Q29udGVudCwgb3V0IGJvb2xlYW4gc3VjY2Vzcywgb3V0IFN0cmluZyByZXN1bHQsIG91dCBWYWx1 ZSBuZXdDYWxsRnJhbWVzKTsKICAgICAgICAgW2hhbmRsZXI9RGVidWddIHZvaWQgZ2V0U2NyaXB0 U291cmNlKGluIFN0cmluZyBzb3VyY2VJRCwgb3V0IFN0cmluZyBzY3JpcHRTb3VyY2UpOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCBkMTA2ZDU2Li4zZGY2 NDVmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNw cAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtMTMx LDYgKzEzMSw3IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBtb25pdG9yaW5nWEhSU3RhdGVO YW1lID0gIm1vbml0b3JpbmdYSFJFbmFibGVkIjsKIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBy ZXNvdXJjZVRyYWNraW5nRW5hYmxlZFN0YXRlTmFtZSA9ICJyZXNvdXJjZVRyYWNraW5nRW5hYmxl ZCI7CiBzdGF0aWMgY29uc3QgY2hhciogY29uc3Qgc2VhcmNoaW5nRm9yTm9kZUVuYWJsZWRTdGF0 ZU5hbWUgPSAic2VhcmNoaW5nRm9yTm9kZUVuYWJsZWQiOwogc3RhdGljIGNvbnN0IGNoYXIqIGNv bnN0IHRpbWVsaW5lUHJvZmlsZXJFbmFibGVkU3RhdGVOYW1lID0gInRpbWVsaW5lUHJvZmlsZXJF bmFibGVkIjsKK3N0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBwYXVzZU9uRXhjZXB0aW9uc1N0YXRl U3RhdGVOYW1lID0gInBhdXNlT25FeGNlcHRpb25zU3RhdGUiOwogCiBzdGF0aWMgY29uc3QgY2hh ciogY29uc3QgaW5zcGVjdG9yQXR0YWNoZWRIZWlnaHROYW1lID0gImluc3BlY3RvckF0dGFjaGVk SGVpZ2h0IjsKIApAQCAtMjU4LDYgKzI1OSwxMCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6 OmdldEluc3BlY3RvclN0YXRlKFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBzdGF0ZSkKIHsKICAg ICAoKnN0YXRlKS0+c2V0Qm9vbGVhbihtb25pdG9yaW5nWEhSU3RhdGVOYW1lLCBtX21vbml0b3Jp bmdYSFIpOwogICAgICgqc3RhdGUpLT5zZXRCb29sZWFuKHJlc291cmNlVHJhY2tpbmdFbmFibGVk U3RhdGVOYW1lLCBtX3Jlc291cmNlVHJhY2tpbmdFbmFibGVkKTsKKyNpZiBFTkFCTEUoSkFWQVND UklQVF9ERUJVR0dFUikKKyAgICBpZiAobV9kZWJ1Z2dlckFnZW50KQorICAgICAgICAoKnN0YXRl KS0+c2V0TnVtYmVyKHBhdXNlT25FeGNlcHRpb25zU3RhdGVTdGF0ZU5hbWUsIG1fZGVidWdnZXJB Z2VudC0+cGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSgpKTsKKyNlbmRpZgogfQogCiB2b2lkIEluc3Bl Y3RvckNvbnRyb2xsZXI6OnVwZGF0ZUluc3BlY3RvclN0YXRlQ29va2llKCkKQEAgLTY3NSwxMCAr NjgwLDYgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpwb3B1bGF0ZVNjcmlwdE9iamVjdHMo KQogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtZXNzYWdlQ291bnQ7ICsraSkKICAgICAg ICAgbV9jb25zb2xlTWVzc2FnZXNbaV0tPmFkZFRvRnJvbnRlbmQobV9mcm9udGVuZC5nZXQoKSwg bV9pbmplY3RlZFNjcmlwdEhvc3QuZ2V0KCkpOwogCi0jaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVC VUdHRVIpCi0gICAgaWYgKGRlYnVnZ2VyRW5hYmxlZCgpKQotICAgICAgICBtX2Zyb250ZW5kLT51 cGRhdGVQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKFNjcmlwdERlYnVnU2VydmVyOjpzaGFyZWQoKS5w YXVzZU9uRXhjZXB0aW9uc1N0YXRlKCkpOwotI2VuZGlmCiAjaWYgRU5BQkxFKERBVEFCQVNFKQog ICAgIERhdGFiYXNlUmVzb3VyY2VzTWFwOjppdGVyYXRvciBkYXRhYmFzZXNFbmQgPSBtX2RhdGFi YXNlUmVzb3VyY2VzLmVuZCgpOwogICAgIGZvciAoRGF0YWJhc2VSZXNvdXJjZXNNYXA6Oml0ZXJh dG9yIGl0ID0gbV9kYXRhYmFzZVJlc291cmNlcy5iZWdpbigpOyBpdCAhPSBkYXRhYmFzZXNFbmQ7 ICsraXQpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFn ZW50LmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCmlu ZGV4IDkyNzU5NjEuLjQ5NjRjMDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRl YnVnZ2VyQWdlbnQuY3BwCkBAIC0xNzIsMTAgKzE3MiwxNSBAQCB2b2lkIEluc3BlY3RvckRlYnVn Z2VyQWdlbnQ6OnN0ZXBPdXRPZkZ1bmN0aW9uKCkKICAgICBTY3JpcHREZWJ1Z1NlcnZlcjo6c2hh cmVkKCkuc3RlcE91dE9mRnVuY3Rpb24oKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFn ZW50OjpzZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKGxvbmcgcGF1c2VTdGF0ZSkKK3ZvaWQgSW5z cGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZShsb25nIHBhdXNl U3RhdGUsIGxvbmcqIG5ld1N0YXRlKQogewogICAgIFNjcmlwdERlYnVnU2VydmVyOjpzaGFyZWQo KS5zZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKHN0YXRpY19jYXN0PFNjcmlwdERlYnVnU2VydmVy OjpQYXVzZU9uRXhjZXB0aW9uc1N0YXRlPihwYXVzZVN0YXRlKSk7Ci0gICAgbV9mcm9udGVuZC0+ dXBkYXRlUGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZShTY3JpcHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCku cGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSgpKTsKKyAgICAqbmV3U3RhdGUgPSBTY3JpcHREZWJ1Z1Nl cnZlcjo6c2hhcmVkKCkucGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSgpOworfQorCitsb25nIEluc3Bl Y3RvckRlYnVnZ2VyQWdlbnQ6OnBhdXNlT25FeGNlcHRpb25zU3RhdGUoKQoreworICAgIHJldHVy biBTY3JpcHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCkucGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSgpOwog fQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmNsZWFyRm9yUGFnZU5hdmlnYXRpb24o KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5o IGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCmluZGV4IGY1YmFh YmMuLjhhNTM3OWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVn Z2VyQWdlbnQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50 LmgKQEAgLTczLDcgKzczLDggQEAgcHVibGljOgogICAgIHZvaWQgc3RlcEludG9TdGF0ZW1lbnQo KTsKICAgICB2b2lkIHN0ZXBPdXRPZkZ1bmN0aW9uKCk7CiAKLSAgICB2b2lkIHNldFBhdXNlT25F eGNlcHRpb25zU3RhdGUobG9uZyBwYXVzZVN0YXRlKTsKKyAgICB2b2lkIHNldFBhdXNlT25FeGNl cHRpb25zU3RhdGUobG9uZyBwYXVzZVN0YXRlLCBsb25nKiBuZXdTdGF0ZSk7CisgICAgbG9uZyBw YXVzZU9uRXhjZXB0aW9uc1N0YXRlKCk7CiAKICAgICB2b2lkIGNsZWFyRm9yUGFnZU5hdmlnYXRp b24oKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQ YW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5k ZXggYjgyYjk5Ni4uODI4MzUyOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzCkBAIC04OTUsNyArODk1LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5l bC5wcm90b3R5cGUgPSB7CiAKICAgICBfdG9nZ2xlUGF1c2VPbkV4Y2VwdGlvbnM6IGZ1bmN0aW9u KCkKICAgICB7Ci0gICAgICAgIEluc3BlY3RvckJhY2tlbmQuc2V0UGF1c2VPbkV4Y2VwdGlvbnNT dGF0ZSgodGhpcy5fcGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi5zdGF0ZSArIDEpICUgdGhpcy5fcGF1 c2VPbkV4Y2VwdGlvbkJ1dHRvbi5zdGF0ZXMpOworICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnNl dFBhdXNlT25FeGNlcHRpb25zU3RhdGUoKHRoaXMuX3BhdXNlT25FeGNlcHRpb25CdXR0b24uc3Rh dGUgKyAxKSAlIHRoaXMuX3BhdXNlT25FeGNlcHRpb25CdXR0b24uc3RhdGVzLCB0aGlzLnVwZGF0 ZVBhdXNlT25FeGNlcHRpb25zU3RhdGUuYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIF90b2dn bGVQYXVzZTogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMKaW5kZXggZmUwMmNmNC4uMjExYjRmYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmpzCkBAIC01OTIsNiArNTkyLDggQEAgV2ViSW5zcGVjdG9yLmRvTG9hZGVkRG9u ZSA9IGZ1bmN0aW9uKCkKICAgICBmdW5jdGlvbiBwb3B1bGF0ZUluc3BlY3RvclN0YXRlKGluc3Bl Y3RvclN0YXRlKQogICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLm1vbml0b3JpbmdYSFJFbmFi bGVkID0gaW5zcGVjdG9yU3RhdGUubW9uaXRvcmluZ1hIUkVuYWJsZWQ7CisgICAgICAgIGlmICgi cGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSIgaW4gaW5zcGVjdG9yU3RhdGUpCisgICAgICAgICAgICBX ZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMudXBkYXRlUGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZShp bnNwZWN0b3JTdGF0ZS5wYXVzZU9uRXhjZXB0aW9uc1N0YXRlKTsKICAgICAgICAgaWYgKGluc3Bl Y3RvclN0YXRlLnJlc291cmNlVHJhY2tpbmdFbmFibGVkKQogICAgICAgICAgICAgV2ViSW5zcGVj dG9yLnBhbmVscy5yZXNvdXJjZXMucmVzb3VyY2VUcmFja2luZ1dhc0VuYWJsZWQoKTsKICAgICAg ICAgZWxzZQpAQCAtNjg0LDggKzY4Niw4IEBAIFdlYkluc3BlY3Rvci5kaXNwYXRjaE1lc3NhZ2VG cm9tQmFja2VuZCA9IGZ1bmN0aW9uKG1lc3NhZ2VPYmplY3QpCiBXZWJJbnNwZWN0b3IucmVwb3J0 UHJvdG9jb2xFcnJvciA9IGZ1bmN0aW9uKG1lc3NhZ2VPYmplY3QpCiB7CiAgICAgY29uc29sZS5l cnJvcigiUHJvdG9jb2wgRXJyb3I6IEluc3BlY3RvckJhY2tlbmQgcmVxdWVzdCB3aXRoIHNlcSA9 ICVkIGZhaWxlZC4iLCBtZXNzYWdlT2JqZWN0LnNlcSk7Ci0gICAgZm9yICh2YXIgZXJyb3IgaW4g bWVzc2FnZU9iamVjdC5lcnJvcnMpCi0gICAgICAgIGNvbnNvbGUuZXJyb3IoIiAgICAiICsgZXJy b3IpOworICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbWVzc2FnZU9iamVjdC5lcnJvcnMubGVuZ3Ro OyArK2kpCisgICAgICAgIGNvbnNvbGUuZXJyb3IoIiAgICAiICsgbWVzc2FnZU9iamVjdC5lcnJv cnNbaV0pOwogICAgIFdlYkluc3BlY3Rvci5yZW1vdmVSZXNwb25zZUNhbGxiYWNrRW50cnkobWVz c2FnZU9iamVjdC5zZXEpOwogfQogCkBAIC0xNDA5LDExICsxNDExLDYgQEAgV2ViSW5zcGVjdG9y LmRlYnVnZ2VyV2FzRW5hYmxlZCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnBhbmVscy5zY3JpcHRz LmRlYnVnZ2VyV2FzRW5hYmxlZCgpOwogfQogCi1XZWJJbnNwZWN0b3IudXBkYXRlUGF1c2VPbkV4 Y2VwdGlvbnNTdGF0ZSA9IGZ1bmN0aW9uKHBhdXNlT25FeGNlcHRpb25zU3RhdGUpCi17Ci0gICAg dGhpcy5wYW5lbHMuc2NyaXB0cy51cGRhdGVQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKHBhdXNlT25F eGNlcHRpb25zU3RhdGUpOwotfQotCiBXZWJJbnNwZWN0b3IuZGVidWdnZXJXYXNEaXNhYmxlZCA9 IGZ1bmN0aW9uKCkKIHsKICAgICB0aGlzLnBhbmVscy5zY3JpcHRzLmRlYnVnZ2VyV2FzRGlzYWJs ZWQoKTsK