64379 2011-07-12 12:04:38 -0700 Web Inspector: do not pause on caught exceptions while typing in the console. 2011-07-18 02:42:51 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 435844 0 pfeldman 2011-07-12 12:04:38 -0700 If user has pauseOnExceptions set to "uncaught", typing in the console may stop in the injected script. Should not. 435863 1 100539 pfeldman 2011-07-12 12:36:47 -0700 Created attachment 100539 Patch 435865 2 webkit.review.bot 2011-07-12 12:39:58 -0700 Attachment 100539 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/inspector/InspectorRuntimeAgent.h:56: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Source/WebCore/inspector/InspectorRuntimeAgent.cpp:60: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 436385 3 100539 yurys 2011-07-13 05:50:35 -0700 Comment on attachment 100539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100539&action=review r- as WorkerInspectoController also needs change. > Source/WebCore/inspector/InspectorController.cpp:132 > + m_runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer()); Let's pass reference to ScriptDebugServer into the InspectorRuntimeAgent constructor. This way compiler will check all call sites and ensure that ScriptDebugServer is never null. 436387 4 100539 yurys 2011-07-13 05:52:12 -0700 Comment on attachment 100539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100539&action=review > Source/WebCore/inspector/InspectorRuntimeAgent.cpp:42 > +#if ENABLE(JAVASCRIPT_DEBUGGER) No need to embrace #include wtih #if ENABLE guard. 437126 5 pfeldman 2011-07-14 09:26:40 -0700 (In reply to comment #3) > (From update of attachment 100539 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=100539&action=review > > r- as WorkerInspectoController also needs change. > > > Source/WebCore/inspector/InspectorController.cpp:132 > > + m_runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer()); > > Let's pass reference to ScriptDebugServer into the InspectorRuntimeAgent constructor. This way compiler will check all call sites and ensure that ScriptDebugServer is never null. There are two ancestors of runtime agent (Page and Worker). Doing what you suggest will add ifdefs into three corresponding classes. It will also make their constructors receive different parameters depending on the DEBUGGER definition. It all kills readability. 438377 6 101138 pfeldman 2011-07-18 01:46:09 -0700 Created attachment 101138 Patch 438378 7 webkit.review.bot 2011-07-18 01:48:37 -0700 Attachment 101138 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/inspector/InspectorRuntimeAgent.h:56: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Source/WebCore/inspector/InspectorRuntimeAgent.cpp:60: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Total errors found: 2 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 438381 8 pfeldman 2011-07-18 02:09:51 -0700 Committed r91176: <http://trac.webkit.org/changeset/91176> 438389 9 pfeldman 2011-07-18 02:42:51 -0700 *** Bug 64684 has been marked as a duplicate of this bug. *** 100539 2011-07-12 12:36:47 -0700 2011-07-18 01:46:00 -0700 Patch bug-64379-20110712233645.patch text/plain 11226 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4MzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmMWNiYWY1NDBjMzY2OWFl NmMxZmM2NmEyMDdkZTM1Njg1ODlhNzhjLi40NTJiZWFjMTQyMTkzYzY4ZTVjZjE5NTIzMDM5M2Vj ZWI0ZDkzZTNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUgQEAKIDIwMTEtMDctMTIgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGRvIG5vdCBwYXVzZSBvbiBjYXVnaHQgZXhjZXB0aW9ucyB3aGlsZSB0eXBpbmcgaW4gdGhlIGNv bnNvbGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 NDM3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6Oklu c3BlY3RvckNvbnRyb2xsZXIpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1l QWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUnVudGltZUFnZW50OjpJbnNw ZWN0b3JSdW50aW1lQWdlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUnVudGltZUFn ZW50OjpldmFsdWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSdW50aW1lQWdlbnQ6 OnNldFNjcmlwdERlYnVnU2VydmVyKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUnVu dGltZUFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuZXZhbEluSW5z cGVjdGVkV2luZG93KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNoRXhwcmVz c2lvbnNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5XYXRjaEV4cHJlc3Np b25zU2VjdGlvbi5wcm90b3R5cGUudXBkYXRlKToKKworMjAxMS0wNy0xMiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogaW50cm9k dWNlIFVzZXJNZXRyaWNzIGZvciBjb2xsZWN0aW5nIHN0YXRzIGluIENocm9taXVtIHBvcnQuCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDM1MAogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggNjg2YWE0ZDU0Y2MwYTMy MmQ4MDAwZGYzZjM2MmY2MjZjNDliNTllYy4uMjM0YTAzNDVkOTY3NTQ1ZTgwYTg1MTIyZmMyYTM5 Y2RlNDg4ZDY1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAt MjQ3LDcgKzI0Nyw4IEBACiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiZXhwcmVzc2lvbiIsICJ0eXBlIjogInN0cmluZyIsICJk ZXNjcmlwdGlvbiI6ICJFeHByZXNzaW9uIHRvIGV2YWx1YXRlLiIgfSwKICAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJvYmplY3RHcm91cCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25h bCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJTeW1ib2xpYyBncm91cCBuYW1lIHRoYXQgY2FuIGJl IHVzZWQgdG8gcmVsZWFzZSBtdWx0aXBsZSBvYmplY3RzLiIgfSwKLSAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJpbmNsdWRlQ29tbWFuZExpbmVBUEkiLCAidHlwZSI6ICJib29sZWFuIiwg Im9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkRldGVybWluZXMgd2hldGhlciBDb21t YW5kIExpbmUgQVBJIHNob3VsZCBiZSBhdmFpbGFibGUgZHVyaW5nIHRoZSBldmFsdWF0aW9uLiIg fQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImluY2x1ZGVDb21tYW5kTGluZUFQSSIs ICJ0eXBlIjogImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiRGV0 ZXJtaW5lcyB3aGV0aGVyIENvbW1hbmQgTGluZSBBUEkgc2hvdWxkIGJlIGF2YWlsYWJsZSBkdXJp bmcgdGhlIGV2YWx1YXRpb24uIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImRv Tm90UGF1c2VPbkV4Y2VwdGlvbnMiLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1 ZSwgImRlc2NyaXB0aW9uIjogIlNwZWNpZmllcyB3aGV0aGVyIGV2YWx1YXRpb24gc2hvdWxkIHN0 b3Agb24gZXhjZXB0aW9ucy4gT3ZlcnJpZGVzIHNldFBhdXNlT25FeGNlcHRpb24gc3RhdGUuIiB9 CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKICAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXN1bHQiLCAiJHJlZiI6ICJSZW1vdGVPYmplY3Qi LCAiZGVzY3JpcHRpb24iOiAiRXZhbHVhdGlvbiByZXN1bHQuIiB9LApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IDc5ODFjNjFiMDBm ZGU5MDdhZjM3NTE5ZDYyYTBhZTdhNjVlZDA2MjIuLjU4ZTUzNzQ4YWNkMjgzOGNhYzgzYmQxMjdk YWIwYjgzZWYzYTM0NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ29udHJvbGxlci5jcHAKQEAgLTEyNyw2ICsxMjcsMTEgQEAgSW5zcGVjdG9yQ29udHJvbGxl cjo6SW5zcGVjdG9yQ29udHJvbGxlcihQYWdlKiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGluc3Bl Y3RvckMKICAgICAgICAgLCBtX2RvbVN0b3JhZ2VBZ2VudC5nZXQoKQogI2VuZGlmCiAgICAgKTsK KworI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQorICAgIG1fcnVudGltZUFnZW50LT5z ZXRTY3JpcHREZWJ1Z1NlcnZlcigmbV9kZWJ1Z2dlckFnZW50LT5zY3JpcHREZWJ1Z1NlcnZlcigp KTsKKyNlbmRpZgorCiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpiaW5kSW5zdHJ1bWVu dGluZ0FnZW50cyhtX3BhZ2UsIG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAK aW5kZXggZWY3MjNmNjM5OTgxMTVkZmFiZGM0ZWMxMmVjM2NjY2E5ZWU5MTU0Mi4uYTM0NmRlMzY5 Yjc2YmUxMjA1YTQxNWVjYTk2MDY3MzIzMzBhZDYyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKQEAgLTM4LDEwICszOCwxOCBA QAogI2luY2x1ZGUgIkluc3BlY3RvclZhbHVlcy5oIgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRy Lmg+CiAKKworI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQorI2luY2x1ZGUgIlNjcmlw dERlYnVnU2VydmVyLmgiCisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBJbnNwZWN0 b3JSdW50aW1lQWdlbnQ6Okluc3BlY3RvclJ1bnRpbWVBZ2VudChJbmplY3RlZFNjcmlwdE1hbmFn ZXIqIGluamVjdGVkU2NyaXB0TWFuYWdlcikKICAgICA6IG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2Vy KGluamVjdGVkU2NyaXB0TWFuYWdlcikKKyNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikK KyAgICAsIG1fc2NyaXB0RGVidWdTZXJ2ZXIoMCkKKyNlbmRpZgogewogfQogCkBAIC00OSwxNCAr NTcsMjggQEAgSW5zcGVjdG9yUnVudGltZUFnZW50Ojp+SW5zcGVjdG9yUnVudGltZUFnZW50KCkK IHsKIH0KIAotdm9pZCBJbnNwZWN0b3JSdW50aW1lQWdlbnQ6OmV2YWx1YXRlKEVycm9yU3RyaW5n KiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBjb25zdCBTdHJpbmcqIGNv bnN0IG9iamVjdEdyb3VwLCBjb25zdCBib29sKiBjb25zdCBpbmNsdWRlQ29tbWFuZExpbmVBUEks IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQsIGJvb2wqIHdhc1Rocm93bikKK3ZvaWQg SW5zcGVjdG9yUnVudGltZUFnZW50OjpldmFsdWF0ZShFcnJvclN0cmluZyogZXJyb3JTdHJpbmcs IGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgY29uc3QgU3RyaW5nKiBjb25zdCBvYmplY3RHcm91 cCwgY29uc3QgYm9vbCogY29uc3QgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBjb25zdCBib29sKiBj b25zdCBkb05vdFBhdXNlT25FeGNlcHRpb25zLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogcmVz dWx0LCBib29sKiB3YXNUaHJvd24pCiB7CiAgICAgSW5qZWN0ZWRTY3JpcHQgaW5qZWN0ZWRTY3Jp cHQgPSBtX2luamVjdGVkU2NyaXB0TWFuYWdlci0+aW5qZWN0ZWRTY3JpcHRGb3IoZ2V0RGVmYXVs dEluc3BlY3RlZFN0YXRlKCkpOwogICAgIGlmIChpbmplY3RlZFNjcmlwdC5oYXNOb1ZhbHVlKCkp IHsKICAgICAgICAgKmVycm9yU3RyaW5nID0gIkluc3BlY3RlZCBmcmFtZSBoYXMgZ29uZSI7CiAg ICAgICAgIHJldHVybjsKICAgICB9CisjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCisg ICAgYm9vbCBwYXVzZVN0YXRlQ2hhbmdlZCA9IGZhbHNlOworICAgIFNjcmlwdERlYnVnU2VydmVy OjpQYXVzZU9uRXhjZXB0aW9uc1N0YXRlIHByZXNlbnRTdGF0ZSA9IG1fc2NyaXB0RGVidWdTZXJ2 ZXItPnBhdXNlT25FeGNlcHRpb25zU3RhdGUoKTsKKyAgICBpZiAoZG9Ob3RQYXVzZU9uRXhjZXB0 aW9ucyAmJiAqZG9Ob3RQYXVzZU9uRXhjZXB0aW9ucyAmJiBwcmVzZW50U3RhdGUgIT0gU2NyaXB0 RGVidWdTZXJ2ZXI6OkRvbnRQYXVzZU9uRXhjZXB0aW9ucykgeworICAgICAgICBtX3NjcmlwdERl YnVnU2VydmVyLT5zZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKFNjcmlwdERlYnVnU2VydmVyOjpE b250UGF1c2VPbkV4Y2VwdGlvbnMpOworICAgICAgICBwYXVzZVN0YXRlQ2hhbmdlZCA9IHRydWU7 CisgICAgfQorI2VuZGlmCisKICAgICBpbmplY3RlZFNjcmlwdC5ldmFsdWF0ZShlcnJvclN0cmlu ZywgZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXAgPyAqb2JqZWN0R3JvdXAgOiAiIiwgaW5jbHVkZUNv bW1hbmRMaW5lQVBJID8gKmluY2x1ZGVDb21tYW5kTGluZUFQSSA6IGZhbHNlLCByZXN1bHQsIHdh c1Rocm93bik7CisKKyNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKKyAgICBpZiAocGF1 c2VTdGF0ZUNoYW5nZWQpCisgICAgICAgIG1fc2NyaXB0RGVidWdTZXJ2ZXItPnNldFBhdXNlT25F eGNlcHRpb25zU3RhdGUocHJlc2VudFN0YXRlKTsKKyNlbmRpZgogfQogCiB2b2lkIEluc3BlY3Rv clJ1bnRpbWVBZ2VudDo6ZXZhbHVhdGVPbihFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0 IFN0cmluZyYgb2JqZWN0SWQsIGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgUmVmUHRyPEluc3Bl Y3Rvck9iamVjdD4qIHJlc3VsdCwgYm9vbCogd2FzVGhyb3duKQpAQCAtMTAwLDYgKzEyMiwxMyBA QCB2b2lkIEluc3BlY3RvclJ1bnRpbWVBZ2VudDo6cmVsZWFzZU9iamVjdEdyb3VwKEVycm9yU3Ry aW5nKiwgY29uc3QgU3RyaW5nJiBvYmplYwogICAgIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5y ZWxlYXNlT2JqZWN0R3JvdXAob2JqZWN0R3JvdXApOwogfQogCisjaWYgRU5BQkxFKEpBVkFTQ1JJ UFRfREVCVUdHRVIpCit2b2lkIEluc3BlY3RvclJ1bnRpbWVBZ2VudDo6c2V0U2NyaXB0RGVidWdT ZXJ2ZXIoU2NyaXB0RGVidWdTZXJ2ZXIqIHNjcmlwdERlYnVnU2VydmVyKQoreworICAgIG1fc2Ny aXB0RGVidWdTZXJ2ZXIgPSBzY3JpcHREZWJ1Z1NlcnZlcjsKK30KKyNlbmRpZgorCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUoSU5TUEVDVE9SKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oCmluZGV4IGQ1ODBl MWQxYjc0MDI3YWJhMzdiMmM5MGRhOGYwMTY3Y2Y0MTBjNTguLjc4NWU1NTNlZWI2YzZiYWYxZGUx M2Y2MzFlZjdlMjgxNTEzZTQ5YjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yUnVudGltZUFnZW50LmgKQEAgLTQzLDYgKzQzLDcgQEAgY2xhc3MgSW5qZWN0ZWRT Y3JpcHRNYW5hZ2VyOwogY2xhc3MgSW5zcGVjdG9yQXJyYXk7CiBjbGFzcyBJbnNwZWN0b3JPYmpl Y3Q7CiBjbGFzcyBJbnNwZWN0b3JWYWx1ZTsKK2NsYXNzIFNjcmlwdERlYnVnU2VydmVyOwogCiB0 eXBlZGVmIFN0cmluZyBFcnJvclN0cmluZzsKIApAQCAtNTIsMTkgKzUzLDI2IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIH5JbnNwZWN0b3JSdW50aW1lQWdlbnQoKTsKIAogICAgIC8vIFBhcnQgb2Yg dGhlIHByb3RvY29sLgotICAgIHZvaWQgZXZhbHVhdGUoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJp bmcmIGV4cHJlc3Npb24sIGNvbnN0IFN0cmluZyogY29uc3Qgb2JqZWN0R3JvdXAsIGNvbnN0IGJv b2wqIGNvbnN0IGluY2x1ZGVDb21tYW5kTGluZUFQSSwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4q IHJlc3VsdCwgYm9vbCogd2FzVGhyb3duKTsKKyAgICB2b2lkIGV2YWx1YXRlKEVycm9yU3RyaW5n KiwgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBjb25zdCBTdHJpbmcqIGNvbnN0IG9iamVjdEdy b3VwLCBjb25zdCBib29sKiBjb25zdCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGNvbnN0IGJvb2wq IGNvbnN0IGRvTm90UGF1c2VPbkV4Y2VwdGlvbnMsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBy ZXN1bHQsIGJvb2wqIHdhc1Rocm93bik7CiAgICAgdm9pZCBldmFsdWF0ZU9uKEVycm9yU3RyaW5n KiwgY29uc3QgU3RyaW5nJiBvYmplY3RJZCwgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBSZWZQ dHI8SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0LCBib29sKiB3YXNUaHJvd24pOwogICAgIHZvaWQg cmVsZWFzZU9iamVjdChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQpOwogICAg IHZvaWQgZ2V0UHJvcGVydGllcyhFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQs IGJvb2wgaWdub3JlSGFzT3duUHJvcGVydHksIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIHJlc3Vs dCk7CiAgICAgdm9pZCBzZXRQcm9wZXJ0eVZhbHVlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5n JiBvYmplY3RJZCwgY29uc3QgU3RyaW5nJiBwcm9wZXJ0eU5hbWUsIGNvbnN0IFN0cmluZyYgZXhw cmVzc2lvbik7CiAgICAgdm9pZCByZWxlYXNlT2JqZWN0R3JvdXAoRXJyb3JTdHJpbmcqLCBjb25z dCBTdHJpbmcmIG9iamVjdEdyb3VwKTsKIAorI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VS KQorICAgIHZvaWQgc2V0U2NyaXB0RGVidWdTZXJ2ZXIoU2NyaXB0RGVidWdTZXJ2ZXIqKTsKKyNl bmRpZgorCiBwcm90ZWN0ZWQ6CiAgICAgZXhwbGljaXQgSW5zcGVjdG9yUnVudGltZUFnZW50KElu amVjdGVkU2NyaXB0TWFuYWdlciopOwogICAgIHZpcnR1YWwgU2NyaXB0U3RhdGUqIGdldERlZmF1 bHRJbnNwZWN0ZWRTdGF0ZSgpID0gMDsKIAogcHJpdmF0ZToKICAgICBJbmplY3RlZFNjcmlwdE1h bmFnZXIqIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOworI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RF QlVHR0VSKQorICAgIFNjcmlwdERlYnVnU2VydmVyKiBtX3NjcmlwdERlYnVnU2VydmVyOworI2Vu ZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRleCA2YjNjNmVmNmM4OGNlNDI5 NmMyOTI4YTdmMDgyYzU1OGZlMDJlNDlmLi5mZmMxYjIwYTE1MjEwMzVmMzI3Y2ExOTBkYTY1Y2Ni Mzc0MTA0OWU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0NvbnNvbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q29uc29sZVZpZXcuanMKQEAgLTM3Myw3ICszNzMsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZp ZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIWV4cHJlc3Npb25TdHJpbmcgJiYgV2ViSW5z cGVjdG9yLnBhbmVscy5zY3JpcHRzLnBhdXNlZCkKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5w YW5lbHMuc2NyaXB0cy5nZXRTZWxlY3RlZENhbGxGcmFtZVZhcmlhYmxlcyhyZXBvcnRDb21wbGV0 aW9ucy5iaW5kKHRoaXMpKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5ldmFsSW5J bnNwZWN0ZWRXaW5kb3coZXhwcmVzc2lvblN0cmluZywgImNvbXBsZXRpb24iLCB0cnVlLCBldmFs dWF0ZWQuYmluZCh0aGlzKSk7CisgICAgICAgICAgICB0aGlzLmV2YWxJbkluc3BlY3RlZFdpbmRv dyhleHByZXNzaW9uU3RyaW5nLCAiY29tcGxldGlvbiIsIHRydWUsIHRydWUsIGV2YWx1YXRlZC5i aW5kKHRoaXMpKTsKIAogICAgICAgICBmdW5jdGlvbiBldmFsdWF0ZWQocmVzdWx0LCB3YXNUaHJv d24pCiAgICAgICAgIHsKQEAgLTU2MCw3ICs1NjAsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZp ZXcucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgfSwKIAotICAgIGV2YWxJbkluc3BlY3Rl ZFdpbmRvdzogZnVuY3Rpb24oZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5k TGluZUFQSSwgY2FsbGJhY2spCisgICAgZXZhbEluSW5zcGVjdGVkV2luZG93OiBmdW5jdGlvbihl eHByZXNzaW9uLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBkb05vdFBhdXNl T25FeGNlcHRpb25zLCBjYWxsYmFjaykKICAgICB7CiAgICAgICAgIGlmIChXZWJJbnNwZWN0b3Iu cGFuZWxzLnNjcmlwdHMgJiYgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLnBhdXNlZCkgewog ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLmV2YWx1YXRlSW5TZWxlY3Rl ZENhbGxGcmFtZShleHByZXNzaW9uLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJ LCBjYWxsYmFjayk7CkBAIC01NzcsNyArNTc3LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3 LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGlmICghZXJyb3IpCiAgICAgICAgICAgICAgICAg Y2FsbGJhY2soV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChyZXN1bHQpLCB3 YXNUaHJvd24pOwogICAgICAgICB9Ci0gICAgICAgIFJ1bnRpbWVBZ2VudC5ldmFsdWF0ZShleHBy ZXNzaW9uLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBldmFsQ2FsbGJhY2sp OworICAgICAgICBSdW50aW1lQWdlbnQuZXZhbHVhdGUoZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXAs IGluY2x1ZGVDb21tYW5kTGluZUFQSSwgZG9Ob3RQYXVzZU9uRXhjZXB0aW9ucywgZXZhbENhbGxi YWNrKTsKICAgICB9LAogCiAgICAgX2VudGVyS2V5UHJlc3NlZDogZnVuY3Rpb24oZXZlbnQpCkBA IC02MDgsNyArNjA4LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsK IAogICAgICAgICAgICAgc2VsZi5hZGRNZXNzYWdlKG5ldyBXZWJJbnNwZWN0b3IuQ29uc29sZUNv bW1hbmRSZXN1bHQocmVzdWx0LCB3YXNUaHJvd24sIGNvbW1hbmRNZXNzYWdlKSk7CiAgICAgICAg IH0KLSAgICAgICAgdGhpcy5ldmFsSW5JbnNwZWN0ZWRXaW5kb3coc3RyLCAiY29uc29sZSIsIHRy dWUsIHByaW50UmVzdWx0KTsKKyAgICAgICAgdGhpcy5ldmFsSW5JbnNwZWN0ZWRXaW5kb3coc3Ry LCAiY29uc29sZSIsIHRydWUsIHVuZGVmaW5lZCwgcHJpbnRSZXN1bHQpOwogCiAgICAgICAgIFdl Ykluc3BlY3Rvci51c2VyTWV0cmljcy5Db25zb2xlRXZhbHVhdGVkLnJlY29yZCgpOwogICAgIH0s CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNoRXhw cmVzc2lvbnNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvV2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzCmluZGV4IDkzNTY4MWU4NDMxYTFhMWJi NDdjZDMyNjdkZjBkZGZjNGZlYjVjOGYuLjJkN2JhMjFhMDg1NzVjYTM1N2RmYzE4NTNiODQxMzE4 ZjdkNDA1MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv V2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvV2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzCkBAIC0xNTksNyAr MTU5LDcgQEAgV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTZWN0aW9uLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIGlmICghZXhwcmVzc2lvbikKICAgICAgICAgICAgICAgICBjb250aW51 ZTsKIAotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuZXZhbEluSW5zcGVjdGVkV2lu ZG93KGV4cHJlc3Npb24sIHRoaXMuX3dhdGNoT2JqZWN0R3JvdXBJZCwgZmFsc2UsIGFwcGVuZFJl c3VsdC5iaW5kKHRoaXMsIGV4cHJlc3Npb24sIGkpKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5jb25zb2xlLmV2YWxJbkluc3BlY3RlZFdpbmRvdyhleHByZXNzaW9uLCB0aGlzLl93YXRjaE9i amVjdEdyb3VwSWQsIGZhbHNlLCB0cnVlLCBhcHBlbmRSZXN1bHQuYmluZCh0aGlzLCBleHByZXNz aW9uLCBpKSk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIXByb3BlcnR5Q291bnQpIHsK 101138 2011-07-18 01:46:09 -0700 2011-07-18 02:07:04 -0700 Patch bug-64379-20110718124607.patch text/plain 11964 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTExNzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1MjBiOGM2MmFiNDNjNmYx NTY4YmQ0MjUzY2MwNGQ0MjdhZTg2OTQwLi45MmFmOTQ4OWViM2ViOTdhOTBiOGZlNjI3MDNmZTNl OTEwY2QwYTEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDctMTggIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGRvIG5vdCBwYXVzZSBvbiBjYXVnaHQgZXhjZXB0aW9ucyB3aGlsZSB0eXBpbmcgaW4gdGhlIGNv bnNvbGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 NDM3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6Oklu c3BlY3RvckNvbnRyb2xsZXIpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1l QWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUnVudGltZUFnZW50OjpJbnNw ZWN0b3JSdW50aW1lQWdlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUnVudGltZUFn ZW50OjpldmFsdWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSdW50aW1lQWdlbnQ6 OnNldFNjcmlwdERlYnVnU2VydmVyKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUnVu dGltZUFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL1dvcmtlckluc3BlY3RvckNvbnRyb2xs ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VySW5zcGVjdG9yQ29udHJvbGxlcjo6V29y a2VySW5zcGVjdG9yQ29udHJvbGxlcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5 cGUuZXZhbEluSW5zcGVjdGVkV2luZG93KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1dhdGNoRXhwcmVzc2lvbnNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5X YXRjaEV4cHJlc3Npb25zU2VjdGlvbi5wcm90b3R5cGUudXBkYXRlKToKKwogMjAxMS0wNy0xOCAg U2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjkxMTMyIGFuZCByOTExMzUuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggNDBlZTU4NzBkNTFkYWYzMDMwODcwMGFmYWI4YTgz Nzk0YTg5YzY2ZC4uMTI3OTkwYjE2YjE2MzI1Nzk3NGIyN2VlNTMxZjVhNmRlNTQ1NDYxNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMjQ3LDcgKzI0Nyw4IEBA CiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiZXhwcmVzc2lvbiIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJF eHByZXNzaW9uIHRvIGV2YWx1YXRlLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJvYmplY3RHcm91cCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNj cmlwdGlvbiI6ICJTeW1ib2xpYyBncm91cCBuYW1lIHRoYXQgY2FuIGJlIHVzZWQgdG8gcmVsZWFz ZSBtdWx0aXBsZSBvYmplY3RzLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJp bmNsdWRlQ29tbWFuZExpbmVBUEkiLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1 ZSwgImRlc2NyaXB0aW9uIjogIkRldGVybWluZXMgd2hldGhlciBDb21tYW5kIExpbmUgQVBJIHNo b3VsZCBiZSBhdmFpbGFibGUgZHVyaW5nIHRoZSBldmFsdWF0aW9uLiIgfQorICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogImluY2x1ZGVDb21tYW5kTGluZUFQSSIsICJ0eXBlIjogImJvb2xl YW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiRGV0ZXJtaW5lcyB3aGV0aGVy IENvbW1hbmQgTGluZSBBUEkgc2hvdWxkIGJlIGF2YWlsYWJsZSBkdXJpbmcgdGhlIGV2YWx1YXRp b24uIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImRvTm90UGF1c2VPbkV4Y2Vw dGlvbnMiLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9u IjogIlNwZWNpZmllcyB3aGV0aGVyIGV2YWx1YXRpb24gc2hvdWxkIHN0b3Agb24gZXhjZXB0aW9u cy4gT3ZlcnJpZGVzIHNldFBhdXNlT25FeGNlcHRpb24gc3RhdGUuIiB9CiAgICAgICAgICAgICAg ICAgXSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKICAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJyZXN1bHQiLCAiJHJlZiI6ICJSZW1vdGVPYmplY3QiLCAiZGVzY3JpcHRpb24i OiAiRXZhbHVhdGlvbiByZXN1bHQuIiB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IDc5ODFjNjFiMDBmZGU5MDdhZjM3NTE5ZDYy YTBhZTdhNjVlZDA2MjIuLjU4ZTUzNzQ4YWNkMjgzOGNhYzgzYmQxMjdkYWIwYjgzZWYzYTM0NTMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5j cHAKQEAgLTEyNyw2ICsxMjcsMTEgQEAgSW5zcGVjdG9yQ29udHJvbGxlcjo6SW5zcGVjdG9yQ29u dHJvbGxlcihQYWdlKiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGluc3BlY3RvckMKICAgICAgICAg LCBtX2RvbVN0b3JhZ2VBZ2VudC5nZXQoKQogI2VuZGlmCiAgICAgKTsKKworI2lmIEVOQUJMRShK QVZBU0NSSVBUX0RFQlVHR0VSKQorICAgIG1fcnVudGltZUFnZW50LT5zZXRTY3JpcHREZWJ1Z1Nl cnZlcigmbV9kZWJ1Z2dlckFnZW50LT5zY3JpcHREZWJ1Z1NlcnZlcigpKTsKKyNlbmRpZgorCiAg ICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpiaW5kSW5zdHJ1bWVudGluZ0FnZW50cyhtX3Bh Z2UsIG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKaW5kZXggZWY3MjNmNjM5 OTgxMTVkZmFiZGM0ZWMxMmVjM2NjY2E5ZWU5MTU0Mi4uOGFiMjExODYzMzViNWQ5NjQ4MmJjOWE5 N2M1OGFlMTE0YmRkOWRlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKQEAgLTM4LDEwICszOCwxOCBAQAogI2luY2x1ZGUgIklu c3BlY3RvclZhbHVlcy5oIgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAKKworI2lmIEVO QUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQorI2luY2x1ZGUgIlNjcmlwdERlYnVnU2VydmVyLmgi CisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBJbnNwZWN0b3JSdW50aW1lQWdlbnQ6 Okluc3BlY3RvclJ1bnRpbWVBZ2VudChJbmplY3RlZFNjcmlwdE1hbmFnZXIqIGluamVjdGVkU2Ny aXB0TWFuYWdlcikKICAgICA6IG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKGluamVjdGVkU2NyaXB0 TWFuYWdlcikKKyNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKKyAgICAsIG1fc2NyaXB0 RGVidWdTZXJ2ZXIoMCkKKyNlbmRpZgogewogfQogCkBAIC00OSwxNCArNTcsMjkgQEAgSW5zcGVj dG9yUnVudGltZUFnZW50Ojp+SW5zcGVjdG9yUnVudGltZUFnZW50KCkKIHsKIH0KIAotdm9pZCBJ bnNwZWN0b3JSdW50aW1lQWdlbnQ6OmV2YWx1YXRlKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywg Y29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBjb25zdCBTdHJpbmcqIGNvbnN0IG9iamVjdEdyb3Vw LCBjb25zdCBib29sKiBjb25zdCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIFJlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+KiByZXN1bHQsIGJvb2wqIHdhc1Rocm93bikKK3ZvaWQgSW5zcGVjdG9yUnVudGlt ZUFnZW50OjpldmFsdWF0ZShFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZyYg ZXhwcmVzc2lvbiwgY29uc3QgU3RyaW5nKiBjb25zdCBvYmplY3RHcm91cCwgY29uc3QgYm9vbCog Y29uc3QgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBjb25zdCBib29sKiBjb25zdCBkb05vdFBhdXNl T25FeGNlcHRpb25zLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0LCBib29sKiB3YXNU aHJvd24pCiB7CiAgICAgSW5qZWN0ZWRTY3JpcHQgaW5qZWN0ZWRTY3JpcHQgPSBtX2luamVjdGVk U2NyaXB0TWFuYWdlci0+aW5qZWN0ZWRTY3JpcHRGb3IoZ2V0RGVmYXVsdEluc3BlY3RlZFN0YXRl KCkpOwogICAgIGlmIChpbmplY3RlZFNjcmlwdC5oYXNOb1ZhbHVlKCkpIHsKICAgICAgICAgKmVy cm9yU3RyaW5nID0gIkluc3BlY3RlZCBmcmFtZSBoYXMgZ29uZSI7CiAgICAgICAgIHJldHVybjsK ICAgICB9CisjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCisgICAgQVNTRVJUKG1fc2Ny aXB0RGVidWdTZXJ2ZXIpOworICAgIGJvb2wgcGF1c2VTdGF0ZUNoYW5nZWQgPSBmYWxzZTsKKyAg ICBTY3JpcHREZWJ1Z1NlcnZlcjo6UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSBwcmVzZW50U3RhdGUg PSBtX3NjcmlwdERlYnVnU2VydmVyLT5wYXVzZU9uRXhjZXB0aW9uc1N0YXRlKCk7CisgICAgaWYg KGRvTm90UGF1c2VPbkV4Y2VwdGlvbnMgJiYgKmRvTm90UGF1c2VPbkV4Y2VwdGlvbnMgJiYgcHJl c2VudFN0YXRlICE9IFNjcmlwdERlYnVnU2VydmVyOjpEb250UGF1c2VPbkV4Y2VwdGlvbnMpIHsK KyAgICAgICAgbV9zY3JpcHREZWJ1Z1NlcnZlci0+c2V0UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZShT Y3JpcHREZWJ1Z1NlcnZlcjo6RG9udFBhdXNlT25FeGNlcHRpb25zKTsKKyAgICAgICAgcGF1c2VT dGF0ZUNoYW5nZWQgPSB0cnVlOworICAgIH0KKyNlbmRpZgorCiAgICAgaW5qZWN0ZWRTY3JpcHQu ZXZhbHVhdGUoZXJyb3JTdHJpbmcsIGV4cHJlc3Npb24sIG9iamVjdEdyb3VwID8gKm9iamVjdEdy b3VwIDogIiIsIGluY2x1ZGVDb21tYW5kTGluZUFQSSA/ICppbmNsdWRlQ29tbWFuZExpbmVBUEkg OiBmYWxzZSwgcmVzdWx0LCB3YXNUaHJvd24pOworCisjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVC VUdHRVIpCisgICAgaWYgKHBhdXNlU3RhdGVDaGFuZ2VkKQorICAgICAgICBtX3NjcmlwdERlYnVn U2VydmVyLT5zZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKHByZXNlbnRTdGF0ZSk7CisjZW5kaWYK IH0KIAogdm9pZCBJbnNwZWN0b3JSdW50aW1lQWdlbnQ6OmV2YWx1YXRlT24oRXJyb3JTdHJpbmcq IGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIG9iamVjdElkLCBjb25zdCBTdHJpbmcmIGV4cHJl c3Npb24sIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQsIGJvb2wqIHdhc1Rocm93bikK QEAgLTEwMCw2ICsxMjMsMTMgQEAgdm9pZCBJbnNwZWN0b3JSdW50aW1lQWdlbnQ6OnJlbGVhc2VP YmplY3RHcm91cChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgb2JqZWMKICAgICBtX2luamVj dGVkU2NyaXB0TWFuYWdlci0+cmVsZWFzZU9iamVjdEdyb3VwKG9iamVjdEdyb3VwKTsKIH0KIAor I2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQordm9pZCBJbnNwZWN0b3JSdW50aW1lQWdl bnQ6OnNldFNjcmlwdERlYnVnU2VydmVyKFNjcmlwdERlYnVnU2VydmVyKiBzY3JpcHREZWJ1Z1Nl cnZlcikKK3sKKyAgICBtX3NjcmlwdERlYnVnU2VydmVyID0gc2NyaXB0RGVidWdTZXJ2ZXI7Cit9 CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRU5BQkxFKElO U1BFQ1RPUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JS dW50aW1lQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1l QWdlbnQuaAppbmRleCBkNTgwZTFkMWI3NDAyN2FiYTM3YjJjOTBkYThmMDE2N2NmNDEwYzU4Li43 ODVlNTUzZWViNmM2YmFmMWRlMTNmNjMxZWY3ZTI4MTUxM2U0OWI5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUnVudGltZUFnZW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oCkBAIC00Myw2ICs0Myw3 IEBAIGNsYXNzIEluamVjdGVkU2NyaXB0TWFuYWdlcjsKIGNsYXNzIEluc3BlY3RvckFycmF5Owog Y2xhc3MgSW5zcGVjdG9yT2JqZWN0OwogY2xhc3MgSW5zcGVjdG9yVmFsdWU7CitjbGFzcyBTY3Jp cHREZWJ1Z1NlcnZlcjsKIAogdHlwZWRlZiBTdHJpbmcgRXJyb3JTdHJpbmc7CiAKQEAgLTUyLDE5 ICs1MywyNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+SW5zcGVjdG9yUnVudGltZUFnZW50KCk7 CiAKICAgICAvLyBQYXJ0IG9mIHRoZSBwcm90b2NvbC4KLSAgICB2b2lkIGV2YWx1YXRlKEVycm9y U3RyaW5nKiwgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBjb25zdCBTdHJpbmcqIGNvbnN0IG9i amVjdEdyb3VwLCBjb25zdCBib29sKiBjb25zdCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIFJlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQsIGJvb2wqIHdhc1Rocm93bik7CisgICAgdm9pZCBl dmFsdWF0ZShFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgY29uc3QgU3Ry aW5nKiBjb25zdCBvYmplY3RHcm91cCwgY29uc3QgYm9vbCogY29uc3QgaW5jbHVkZUNvbW1hbmRM aW5lQVBJLCBjb25zdCBib29sKiBjb25zdCBkb05vdFBhdXNlT25FeGNlcHRpb25zLCBSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0LCBib29sKiB3YXNUaHJvd24pOwogICAgIHZvaWQgZXZh bHVhdGVPbihFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGNvbnN0IFN0cmlu ZyYgZXhwcmVzc2lvbiwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIHJlc3VsdCwgYm9vbCogd2Fz VGhyb3duKTsKICAgICB2b2lkIHJlbGVhc2VPYmplY3QoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJp bmcmIG9iamVjdElkKTsKICAgICB2b2lkIGdldFByb3BlcnRpZXMoRXJyb3JTdHJpbmcqLCBjb25z dCBTdHJpbmcmIG9iamVjdElkLCBib29sIGlnbm9yZUhhc093blByb3BlcnR5LCBSZWZQdHI8SW5z cGVjdG9yQXJyYXk+KiByZXN1bHQpOwogICAgIHZvaWQgc2V0UHJvcGVydHlWYWx1ZShFcnJvclN0 cmluZyosIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGNvbnN0IFN0cmluZyYgcHJvcGVydHlOYW1l LCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24pOwogICAgIHZvaWQgcmVsZWFzZU9iamVjdEdyb3Vw KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBvYmplY3RHcm91cCk7CiAKKyNpZiBFTkFCTEUo SkFWQVNDUklQVF9ERUJVR0dFUikKKyAgICB2b2lkIHNldFNjcmlwdERlYnVnU2VydmVyKFNjcmlw dERlYnVnU2VydmVyKik7CisjZW5kaWYKKwogcHJvdGVjdGVkOgogICAgIGV4cGxpY2l0IEluc3Bl Y3RvclJ1bnRpbWVBZ2VudChJbmplY3RlZFNjcmlwdE1hbmFnZXIqKTsKICAgICB2aXJ0dWFsIFNj cmlwdFN0YXRlKiBnZXREZWZhdWx0SW5zcGVjdGVkU3RhdGUoKSA9IDA7CiAKIHByaXZhdGU6CiAg ICAgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiBtX2luamVjdGVkU2NyaXB0TWFuYWdlcjsKKyNpZiBF TkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKKyAgICBTY3JpcHREZWJ1Z1NlcnZlciogbV9zY3Jp cHREZWJ1Z1NlcnZlcjsKKyNlbmRpZgogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dvcmtlckluc3BlY3RvckNvbnRyb2xs ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dvcmtlckluc3BlY3RvckNvbnRyb2xs ZXIuY3BwCmluZGV4IDk1MTJjYjc2ZDkzMTk0N2VmOTY0ZjMyOWYzYWY3MDg3ODcyZGZlODMuLjUx MmFhZjU2NzViZjZmMmJhMjUyZjNhZjZhZjllZjMwMjQ0Y2ZlYjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV29ya2VySW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAg LTEwMyw2ICsxMDMsMTAgQEAgV29ya2VySW5zcGVjdG9yQ29udHJvbGxlcjo6V29ya2VySW5zcGVj dG9yQ29udHJvbGxlcihXb3JrZXJDb250ZXh0KiB3b3JrZXJDb250ZXgKICAgICAgICAgLCAwCiAj ZW5kaWYKICAgICApOworCisjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCisgICAgbV9y dW50aW1lQWdlbnQtPnNldFNjcmlwdERlYnVnU2VydmVyKCZtX2RlYnVnZ2VyQWdlbnQtPnNjcmlw dERlYnVnU2VydmVyKCkpOworI2VuZGlmCiB9CiAgCiBXb3JrZXJJbnNwZWN0b3JDb250cm9sbGVy Ojp+V29ya2VySW5zcGVjdG9yQ29udHJvbGxlcigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRleCA2YjNjNmVmNmM4OGNlNDI5NmMy OTI4YTdmMDgyYzU1OGZlMDJlNDlmLi5mZmMxYjIwYTE1MjEwMzVmMzI3Y2ExOTBkYTY1Y2NiMzc0 MTA0OWU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nv bnNvbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29u c29sZVZpZXcuanMKQEAgLTM3Myw3ICszNzMsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcu cHJvdG90eXBlID0gewogICAgICAgICBpZiAoIWV4cHJlc3Npb25TdHJpbmcgJiYgV2ViSW5zcGVj dG9yLnBhbmVscy5zY3JpcHRzLnBhdXNlZCkKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5l bHMuc2NyaXB0cy5nZXRTZWxlY3RlZENhbGxGcmFtZVZhcmlhYmxlcyhyZXBvcnRDb21wbGV0aW9u cy5iaW5kKHRoaXMpKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5ldmFsSW5JbnNw ZWN0ZWRXaW5kb3coZXhwcmVzc2lvblN0cmluZywgImNvbXBsZXRpb24iLCB0cnVlLCBldmFsdWF0 ZWQuYmluZCh0aGlzKSk7CisgICAgICAgICAgICB0aGlzLmV2YWxJbkluc3BlY3RlZFdpbmRvdyhl eHByZXNzaW9uU3RyaW5nLCAiY29tcGxldGlvbiIsIHRydWUsIHRydWUsIGV2YWx1YXRlZC5iaW5k KHRoaXMpKTsKIAogICAgICAgICBmdW5jdGlvbiBldmFsdWF0ZWQocmVzdWx0LCB3YXNUaHJvd24p CiAgICAgICAgIHsKQEAgLTU2MCw3ICs1NjAsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcu cHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgfSwKIAotICAgIGV2YWxJbkluc3BlY3RlZFdp bmRvdzogZnVuY3Rpb24oZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGlu ZUFQSSwgY2FsbGJhY2spCisgICAgZXZhbEluSW5zcGVjdGVkV2luZG93OiBmdW5jdGlvbihleHBy ZXNzaW9uLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBkb05vdFBhdXNlT25F eGNlcHRpb25zLCBjYWxsYmFjaykKICAgICB7CiAgICAgICAgIGlmIChXZWJJbnNwZWN0b3IucGFu ZWxzLnNjcmlwdHMgJiYgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLnBhdXNlZCkgewogICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLmV2YWx1YXRlSW5TZWxlY3RlZENh bGxGcmFtZShleHByZXNzaW9uLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBj YWxsYmFjayk7CkBAIC01NzcsNyArNTc3LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgIGlmICghZXJyb3IpCiAgICAgICAgICAgICAgICAgY2Fs bGJhY2soV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChyZXN1bHQpLCB3YXNU aHJvd24pOwogICAgICAgICB9Ci0gICAgICAgIFJ1bnRpbWVBZ2VudC5ldmFsdWF0ZShleHByZXNz aW9uLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBldmFsQ2FsbGJhY2spOwor ICAgICAgICBSdW50aW1lQWdlbnQuZXZhbHVhdGUoZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXAsIGlu Y2x1ZGVDb21tYW5kTGluZUFQSSwgZG9Ob3RQYXVzZU9uRXhjZXB0aW9ucywgZXZhbENhbGxiYWNr KTsKICAgICB9LAogCiAgICAgX2VudGVyS2V5UHJlc3NlZDogZnVuY3Rpb24oZXZlbnQpCkBAIC02 MDgsNyArNjA4LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKIAog ICAgICAgICAgICAgc2VsZi5hZGRNZXNzYWdlKG5ldyBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1h bmRSZXN1bHQocmVzdWx0LCB3YXNUaHJvd24sIGNvbW1hbmRNZXNzYWdlKSk7CiAgICAgICAgIH0K LSAgICAgICAgdGhpcy5ldmFsSW5JbnNwZWN0ZWRXaW5kb3coc3RyLCAiY29uc29sZSIsIHRydWUs IHByaW50UmVzdWx0KTsKKyAgICAgICAgdGhpcy5ldmFsSW5JbnNwZWN0ZWRXaW5kb3coc3RyLCAi Y29uc29sZSIsIHRydWUsIHVuZGVmaW5lZCwgcHJpbnRSZXN1bHQpOwogCiAgICAgICAgIFdlYklu c3BlY3Rvci51c2VyTWV0cmljcy5Db25zb2xlRXZhbHVhdGVkLnJlY29yZCgpOwogICAgIH0sCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNoRXhwcmVz c2lvbnNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv V2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzCmluZGV4IDkzNTY4MWU4NDMxYTFhMWJiNDdj ZDMyNjdkZjBkZGZjNGZlYjVjOGYuLjJkN2JhMjFhMDg1NzVjYTM1N2RmYzE4NTNiODQxMzE4Zjdk NDA1MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2F0 Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvV2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzCkBAIC0xNTksNyArMTU5 LDcgQEAgV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTZWN0aW9uLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIGlmICghZXhwcmVzc2lvbikKICAgICAgICAgICAgICAgICBjb250aW51ZTsK IAotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuZXZhbEluSW5zcGVjdGVkV2luZG93 KGV4cHJlc3Npb24sIHRoaXMuX3dhdGNoT2JqZWN0R3JvdXBJZCwgZmFsc2UsIGFwcGVuZFJlc3Vs dC5iaW5kKHRoaXMsIGV4cHJlc3Npb24sIGkpKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5j b25zb2xlLmV2YWxJbkluc3BlY3RlZFdpbmRvdyhleHByZXNzaW9uLCB0aGlzLl93YXRjaE9iamVj dEdyb3VwSWQsIGZhbHNlLCB0cnVlLCBhcHBlbmRSZXN1bHQuYmluZCh0aGlzLCBleHByZXNzaW9u LCBpKSk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIXByb3BlcnR5Q291bnQpIHsK