77409 2012-01-31 00:37:25 -0800 Web Inspector: DOMDebugger.setEventListenerBreakpoint should accept regular DOM event names. 2012-01-31 02:05:57 -0800 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 545832 0 pfeldman 2012-01-31 00:37:25 -0800 Currently it operates "listener:<eventname>" strings. 545836 1 124678 pfeldman 2012-01-31 00:54:53 -0800 Created attachment 124678 Patch 545837 2 webkit.review.bot 2012-01-31 00:58:04 -0800 Attachment 124678 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource From git://git.webkit.org/WebKit + f6387b5...c57450d master -> origin/master (forced update) Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 106342 = f6387b580da90ff9c3210bc103deac351cbebee2 r106341 = 7099bf5ec21421b321397d0043f4c212a20f4bb6 r106342 = 918a007575443f00152cc423a9412f083275860b r106343 = c57450da079d27d2b4fd1ee5daecdf7a12dce827 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Applying: Fix compilation errors on build-webkit --debug --no-workers on mac. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Auto-merging LayoutTests/platform/qt/Skipped CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped Failed to merge in the changes. Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. If any of these errors are false positives, please file a bug against check-webkit-style. 545854 3 124678 yurys 2012-01-31 01:43:19 -0800 Comment on attachment 124678 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124678&action=review > Source/WebCore/inspector/Inspector.json:2283 > + "name": "setInstrumentationBreakpoint", setInstrumentationBreakpoint is a bit confusing, probably setTimerBreakpoint as we don't support other types of such breakpoints? > Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp:153 > + removeBreakpoint(error, String(listenerEventCategoryType) + eventName); Why not aggregate breakpoints by categories in the storage? > Source/WebCore/inspector/front-end/BreakpointsSidebarPane.js:569 > + if (eventName.indexOf(WebInspector.EventListenerBreakpointsSidebarPane.categotyListener) === 0) You can pass category and event type as two separate parameters then you wouldn't need to first combine and then split them. 545855 4 124678 yurys 2012-01-31 01:43:45 -0800 Comment on attachment 124678 Patch Please address comments before landing. 545861 5 pfeldman 2012-01-31 01:58:54 -0800 > setInstrumentationBreakpoint is a bit confusing, probably setTimerBreakpoint as we don't support other types of such breakpoints? > We have a number of pending requests for additional instrumentation. > > Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp:153 > > + removeBreakpoint(error, String(listenerEventCategoryType) + eventName); > > Why not aggregate breakpoints by categories in the storage? Because we would loose all the stored breakpoints. > > Source/WebCore/inspector/front-end/BreakpointsSidebarPane.js:569 > > + if (eventName.indexOf(WebInspector.EventListenerBreakpointsSidebarPane.categotyListener) === 0) > > You can pass category and event type as two separate parameters then you wouldn't need to first combine and then split them. That only solves one call site problem. 545866 6 pfeldman 2012-01-31 02:05:57 -0800 Committed r106347: <http://trac.webkit.org/changeset/106347> 124678 2012-01-31 00:54:53 -0800 2012-01-31 01:43:45 -0800 Patch bug-77409-20120131125451.patch text/plain 20139 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmUzZDk5YjI2ZTBiYjRm OTRjMzI0NjhmMjM3NjNmZDViZDQ5YjI0Yi4uYjhjZDUxMzc2OTk3ZDUwYTZiMmY5ZWM1YjJlZjk3 MDI5YjJiYTc3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTAxLTMxICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBET01EZWJ1Z2dlci5zZXRFdmVudExpc3RlbmVyQnJlYWtwb2ludCBzaG91bGQgYWNjZXB0IHJl Z3VsYXIgRE9NIGV2ZW50IG5hbWVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Nzc0MDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JET01EZWJ1Z2dlckFnZW50OjpzZXRFdmVudExpc3RlbmVyQnJlYWtwb2ludCk6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTURlYnVnZ2Vy QWdlbnQ6OnNldEluc3RydW1lbnRhdGlvbkJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudDo6c2V0QnJlYWtwb2ludCk6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50OjpyZW1vdmVFdmVudExpc3RlbmVyQnJlYWtw b2ludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50OjpyZW1v dmVJbnN0cnVtZW50YXRpb25CcmVha3BvaW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckRPTURlYnVnZ2VyQWdlbnQ6OnJlbW92ZUJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudDo6cGF1c2VPbk5hdGl2ZUV2ZW50SWZOZWVkZWQpOgor ICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50Lmg6CisgICAgICAg IChJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6ZGlkSW5zdGFsbFRpbWVySW1wbCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlbW92ZVRpbWVySW1wbCk6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxIYW5kbGVFdmVudEltcGwpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsRmlyZVRpbWVySW1w bCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnBhdXNlT25O YXRpdmVFdmVudElmTmVlZGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uLmg6CisgICAgICAgIChJbnNwZWN0b3JJbnN0cnVtZW50YXRpb24pOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5wcm90 b3R5cGUuX3NldEJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVu ZXJCcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3RvdHlwZS5fcmVtb3ZlQnJlYWtwb2ludCk6CisK IDIwMTItMDEtMzAgIEtvbnJhZCBQaWFzY2lrICA8a3BpYXNjaWtAcmltLmNvbT4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBbQmxhY2tCZXJyeV0gQWRkIEJsYWNrQmVycnkgVUEgU3RyaW5ncyB0 byB0aGUgSW5zcGVjdG9yJ3MgVUEgc3dpdGNoZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuanNvbgppbmRleCA2MzMzMTY1MzkwZjdkMDNkNWIzOTM1YmVhNWI3MWQ2NGYzZTQ2OGNh Li4wMDU3MDViMTEzYjJlYWNiZGJjZTI0N2MxNWZlZWRkMWE3NjJlNzkzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0yMjY4LDcgKzIyNjgsNyBAQAogICAgICAg ICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogInNldEV2ZW50TGlzdGVuZXJCcmVha3Bv aW50IiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJldmVudE5hbWUiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24i OiAiRXZlbnQgbmFtZSB0byBzdG9wIG9uIChhbnkgRE9NIGV2ZW50IHdpbGwgZG8pLiIgfQorICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImV2ZW50TmFtZSIsICJ0eXBlIjogInN0cmluZyIs ICJkZXNjcmlwdGlvbiI6ICJET00gRXZlbnQgbmFtZSB0byBzdG9wIG9uIChhbnkgRE9NIGV2ZW50 IHdpbGwgZG8pLiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2Ny aXB0aW9uIjogIlNldHMgYnJlYWtwb2ludCBvbiBwYXJ0aWN1bGFyIERPTSBldmVudC4iCiAgICAg ICAgICAgICB9LApAQCAtMjI4MCw2ICsyMjgwLDIyIEBACiAgICAgICAgICAgICAgICAgImRlc2Ny aXB0aW9uIjogIlJlbW92ZXMgYnJlYWtwb2ludCBvbiBwYXJ0aWN1bGFyIERPTSBldmVudC4iCiAg ICAgICAgICAgICB9LAogICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJuYW1lIjogInNl dEluc3RydW1lbnRhdGlvbkJyZWFrcG9pbnQiLAorICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJz IjogWworICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImV2ZW50TmFtZSIsICJ0eXBlIjog InN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJJbnN0cnVtZW50YXRpb24gbmFtZSB0byBzdG9wIG9u LiIgfQorICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjog IlNldHMgYnJlYWtwb2ludCBvbiBwYXJ0aWN1bGFyIG5hdGl2ZSBldmVudC4iLAorICAgICAgICAg ICAgICAgICJoaWRkZW4iOiB0cnVlCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgICJuYW1lIjogInJlbW92ZUluc3RydW1lbnRhdGlvbkJyZWFrcG9pbnQiLAor ICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWworICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogImV2ZW50TmFtZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJJbnN0 cnVtZW50YXRpb24gbmFtZSB0byBzdG9wIG9uLiIgfQorICAgICAgICAgICAgICAgIF0sCisgICAg ICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlNldHMgYnJlYWtwb2ludCBvbiBwYXJ0aWN1bGFy IG5hdGl2ZSBldmVudC4iLAorICAgICAgICAgICAgICAgICJoaWRkZW4iOiB0cnVlCisgICAgICAg ICAgICB9LAorICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogInNldFhIUkJy ZWFrcG9pbnQiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6 ICJSZXNvdXJjZSBVUkwgc3Vic3RyaW5nLiBBbGwgWEhScyBoYXZpbmcgdGhpcyBzdWJzdHJpbmcg aW4gdGhlIFVSTCB3aWxsIGdldCBzdG9wcGVkIHVwb24uIiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudC5jcHAKaW5kZXggMWY5 MjY2ODA2NjFmNGE3NWIxOGY2ZWQ1M2EzZTcwN2UzYTNkOGE0MC4uOWJhNmJjOTM4OTExM2ZiZjBh ZDU5MTBiNmEzM2EzMDcxMWNkMDA1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50LmNwcApAQCAtMzgsNiArMzgsNyBAQAog I2luY2x1ZGUgIkluc3BlY3RvckFnZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yRE9NQWdlbnQu aCIKICNpbmNsdWRlICJJbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgiCisjaW5jbHVkZSAiSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yU3RhdGUuaCIKICNpbmNs dWRlICJJbnNwZWN0b3JWYWx1ZXMuaCIKICNpbmNsdWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgi CkBAIC01Miw2ICs1Myw5IEBAIGVudW0gRE9NQnJlYWtwb2ludFR5cGUgewogICAgIERPTUJyZWFr cG9pbnRUeXBlc0NvdW50CiB9OwogCitzdGF0aWMgY29uc3QgY2hhciogY29uc3QgbGlzdGVuZXJF dmVudENhdGVnb3J5VHlwZSA9ICJsaXN0ZW5lcjoiOworc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0 IGluc3RydW1lbnRhdGlvbkV2ZW50Q2F0ZWdvcnlUeXBlID0gImluc3RydW1lbnRhdGlvbjoiOwor CiBzdGF0aWMgY29uc3QgY2hhciogY29uc3QgZG9tTmF0aXZlQnJlYWtwb2ludFR5cGUgPSAiRE9N IjsKIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBldmVudExpc3RlbmVyTmF0aXZlQnJlYWtwb2lu dFR5cGUgPSAiRXZlbnRMaXN0ZW5lciI7CiBzdGF0aWMgY29uc3QgY2hhciogY29uc3QgeGhyTmF0 aXZlQnJlYWtwb2ludFR5cGUgPSAiWEhSIjsKQEAgLTEyNCw2ICsxMjgsMTYgQEAgdm9pZCBJbnNw ZWN0b3JET01EZWJ1Z2dlckFnZW50OjpkaXNjYXJkQmluZGluZ3MoKQogCiB2b2lkIEluc3BlY3Rv ckRPTURlYnVnZ2VyQWdlbnQ6OnNldEV2ZW50TGlzdGVuZXJCcmVha3BvaW50KEVycm9yU3RyaW5n KiBlcnJvciwgY29uc3QgU3RyaW5nJiBldmVudE5hbWUpCiB7CisgICAgc2V0QnJlYWtwb2ludChl cnJvciwgU3RyaW5nKGxpc3RlbmVyRXZlbnRDYXRlZ29yeVR5cGUpICsgZXZlbnROYW1lKTsKK30K Kwordm9pZCBJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50OjpzZXRJbnN0cnVtZW50YXRpb25CcmVh a3BvaW50KEVycm9yU3RyaW5nKiBlcnJvciwgY29uc3QgU3RyaW5nJiBldmVudE5hbWUpCit7Cisg ICAgc2V0QnJlYWtwb2ludChlcnJvciwgU3RyaW5nKGluc3RydW1lbnRhdGlvbkV2ZW50Q2F0ZWdv cnlUeXBlKSArIGV2ZW50TmFtZSk7Cit9CisKK3ZvaWQgSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2Vu dDo6c2V0QnJlYWtwb2ludChFcnJvclN0cmluZyogZXJyb3IsIGNvbnN0IFN0cmluZyYgZXZlbnRO YW1lKQorewogICAgIGlmIChldmVudE5hbWUuaXNFbXB0eSgpKSB7CiAgICAgICAgICplcnJvciA9 ICJFdmVudCBuYW1lIGlzIGVtcHR5IjsKICAgICAgICAgcmV0dXJuOwpAQCAtMTM2LDYgKzE1MCwx NiBAQCB2b2lkIEluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6OnNldEV2ZW50TGlzdGVuZXJCcmVh a3BvaW50KEVycm9yU3RyaW5nKiBlcnJvciwgYwogCiB2b2lkIEluc3BlY3RvckRPTURlYnVnZ2Vy QWdlbnQ6OnJlbW92ZUV2ZW50TGlzdGVuZXJCcmVha3BvaW50KEVycm9yU3RyaW5nKiBlcnJvciwg Y29uc3QgU3RyaW5nJiBldmVudE5hbWUpCiB7CisgICAgcmVtb3ZlQnJlYWtwb2ludChlcnJvciwg U3RyaW5nKGxpc3RlbmVyRXZlbnRDYXRlZ29yeVR5cGUpICsgZXZlbnROYW1lKTsKK30KKwordm9p ZCBJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50OjpyZW1vdmVJbnN0cnVtZW50YXRpb25CcmVha3Bv aW50KEVycm9yU3RyaW5nKiBlcnJvciwgY29uc3QgU3RyaW5nJiBldmVudE5hbWUpCit7CisgICAg cmVtb3ZlQnJlYWtwb2ludChlcnJvciwgU3RyaW5nKGluc3RydW1lbnRhdGlvbkV2ZW50Q2F0ZWdv cnlUeXBlKSArIGV2ZW50TmFtZSk7Cit9CisKK3ZvaWQgSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2Vu dDo6cmVtb3ZlQnJlYWtwb2ludChFcnJvclN0cmluZyogZXJyb3IsIGNvbnN0IFN0cmluZyYgZXZl bnROYW1lKQorewogICAgIGlmIChldmVudE5hbWUuaXNFbXB0eSgpKSB7CiAgICAgICAgICplcnJv ciA9ICJFdmVudCBuYW1lIGlzIGVtcHR5IjsKICAgICAgICAgcmV0dXJuOwpAQCAtMzMzLDkgKzM1 Nyw5IEBAIHZvaWQgSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudDo6dXBkYXRlU3VidHJlZUJyZWFr cG9pbnRzKE5vZGUqIG5vZGUsIHVpbnQzMl90IHJvCiAgICAgICAgIHVwZGF0ZVN1YnRyZWVCcmVh a3BvaW50cyhjaGlsZCwgbmV3Um9vdE1hc2ssIHNldCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRE9N RGVidWdnZXJBZ2VudDo6cGF1c2VPbk5hdGl2ZUV2ZW50SWZOZWVkZWQoY29uc3QgU3RyaW5nJiBj YXRlZ29yeVR5cGUsIGNvbnN0IFN0cmluZyYgZXZlbnROYW1lLCBib29sIHN5bmNocm9ub3VzKQor dm9pZCBJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50OjpwYXVzZU9uTmF0aXZlRXZlbnRJZk5lZWRl ZChib29sIGlzRE9NRXZlbnQsIGNvbnN0IFN0cmluZyYgZXZlbnROYW1lLCBib29sIHN5bmNocm9u b3VzKQogewotICAgIFN0cmluZyBmdWxsRXZlbnROYW1lID0gY2F0ZWdvcnlUeXBlICsgJzonICsg ZXZlbnROYW1lOworICAgIFN0cmluZyBmdWxsRXZlbnROYW1lID0gKGlzRE9NRXZlbnQgPyBsaXN0 ZW5lckV2ZW50Q2F0ZWdvcnlUeXBlIDogaW5zdHJ1bWVudGF0aW9uRXZlbnRDYXRlZ29yeVR5cGUp ICsgZXZlbnROYW1lOwogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGV2ZW50TGlzdGVuZXJC cmVha3BvaW50cyA9IG1fc3RhdGUtPmdldE9iamVjdChET01EZWJ1Z2dlckFnZW50U3RhdGU6OmV2 ZW50TGlzdGVuZXJCcmVha3BvaW50cyk7CiAgICAgaWYgKGV2ZW50TGlzdGVuZXJCcmVha3BvaW50 cy0+ZmluZChmdWxsRXZlbnROYW1lKSA9PSBldmVudExpc3RlbmVyQnJlYWtwb2ludHMtPmVuZCgp KQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuaAppbmRleCBlMTIyZTRmZmMyYzg0NDQxMzNjMTc5NmU2 M2M3NzBiYjJiMzMwYTUwLi5jNDlmNmJlYzU4OTM1YWJhY2Q1Y2Q4Njc0Yjc4MjdiZjRlMmQ1Njdj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdn ZXJBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1 Z2dlckFnZW50LmgKQEAgLTY2LDYgKzY2LDggQEAgcHVibGljOgogICAgIHZvaWQgcmVtb3ZlWEhS QnJlYWtwb2ludChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgdXJsKTsKICAgICB2b2lkIHNl dEV2ZW50TGlzdGVuZXJCcmVha3BvaW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBldmVu dE5hbWUpOwogICAgIHZvaWQgcmVtb3ZlRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnQoRXJyb3JTdHJp bmcqLCBjb25zdCBTdHJpbmcmIGV2ZW50TmFtZSk7CisgICAgdm9pZCBzZXRJbnN0cnVtZW50YXRp b25CcmVha3BvaW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBldmVudE5hbWUpOworICAg IHZvaWQgcmVtb3ZlSW5zdHJ1bWVudGF0aW9uQnJlYWtwb2ludChFcnJvclN0cmluZyosIGNvbnN0 IFN0cmluZyYgZXZlbnROYW1lKTsKICAgICB2b2lkIHNldERPTUJyZWFrcG9pbnQoRXJyb3JTdHJp bmcqLCBpbnQgbm9kZUlkLCBjb25zdCBTdHJpbmcmIHR5cGUpOwogICAgIHZvaWQgcmVtb3ZlRE9N QnJlYWtwb2ludChFcnJvclN0cmluZyosIGludCBub2RlSWQsIGNvbnN0IFN0cmluZyYgdHlwZSk7 CiAKQEAgLTc3LDcgKzc5LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlkUmVtb3ZlRE9NTm9kZShO b2RlKik7CiAgICAgdm9pZCB3aWxsTW9kaWZ5RE9NQXR0cihFbGVtZW50Kik7CiAgICAgdm9pZCB3 aWxsU2VuZFhNTEh0dHBSZXF1ZXN0KGNvbnN0IFN0cmluZyYgdXJsKTsKLSAgICB2b2lkIHBhdXNl T25OYXRpdmVFdmVudElmTmVlZGVkKGNvbnN0IFN0cmluZyYgY2F0ZWdvcnlUeXBlLCBjb25zdCBT dHJpbmcmIGV2ZW50TmFtZSwgYm9vbCBzeW5jaHJvbm91cyk7CisgICAgdm9pZCBwYXVzZU9uTmF0 aXZlRXZlbnRJZk5lZWRlZChib29sIGlzRE9NRXZlbnQsIGNvbnN0IFN0cmluZyYgZXZlbnROYW1l LCBib29sIHN5bmNocm9ub3VzKTsKIAogICAgIHZpcnR1YWwgdm9pZCBjbGVhckZyb250ZW5kKCk7 CiAgICAgdmlydHVhbCB2b2lkIGRpc2NhcmRBZ2VudCgpOwpAQCAtOTQsNiArOTYsOCBAQCBwcml2 YXRlOgogICAgIHZvaWQgdXBkYXRlU3VidHJlZUJyZWFrcG9pbnRzKE5vZGUqLCB1aW50MzJfdCBy b290TWFzaywgYm9vbCBzZXQpOwogICAgIGJvb2wgaGFzQnJlYWtwb2ludChOb2RlKiwgaW50IHR5 cGUpOwogICAgIHZvaWQgZGlzY2FyZEJpbmRpbmdzKCk7CisgICAgdm9pZCBzZXRCcmVha3BvaW50 KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBldmVudE5hbWUpOworICAgIHZvaWQgcmVtb3Zl QnJlYWtwb2ludChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgZXZlbnROYW1lKTsKIAogICAg IHZvaWQgY2xlYXIoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAppbmRleCBiNGFmMTgyNzYxN2M3MTY2OWQyNTA0NTRi NzhjMzhhMDkwMjNlZjA2Li4zM2QwMDIxNTk3Mzc5OTY1NmYxNTk4YjE4NmI1MjVkNjcyOWU0YTZj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uLmNwcApAQCAtNzEsOSArNzEsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK LXN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBsaXN0ZW5lckV2ZW50Q2F0ZWdvcnlUeXBlID0gImxp c3RlbmVyIjsKLXN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBpbnN0cnVtZW50YXRpb25FdmVudENh dGVnb3J5VHlwZSA9ICJpbnN0cnVtZW50YXRpb24iOwotCiBzdGF0aWMgY29uc3QgY2hhciogY29u c3Qgc2V0VGltZXJFdmVudE5hbWUgPSAic2V0VGltZXIiOwogc3RhdGljIGNvbnN0IGNoYXIqIGNv bnN0IGNsZWFyVGltZXJFdmVudE5hbWUgPSAiY2xlYXJUaW1lciI7CiBzdGF0aWMgY29uc3QgY2hh ciogY29uc3QgdGltZXJGaXJlZEV2ZW50TmFtZSA9ICJ0aW1lckZpcmVkIjsKQEAgLTIzMiwxNCAr MjI5LDE0IEBAIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRTY2hlZHVsZVJlc291 cmNlUmVxdWVzdEltcGwoSW5zdHJ1bWVudGluZ0FnZW50CiAKIHZvaWQgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOjpkaWRJbnN0YWxsVGltZXJJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3Ry dW1lbnRpbmdBZ2VudHMsIGludCB0aW1lcklkLCBpbnQgdGltZW91dCwgYm9vbCBzaW5nbGVTaG90 KQogewotICAgIHBhdXNlT25OYXRpdmVFdmVudElmTmVlZGVkKGluc3RydW1lbnRpbmdBZ2VudHMs IGluc3RydW1lbnRhdGlvbkV2ZW50Q2F0ZWdvcnlUeXBlLCBzZXRUaW1lckV2ZW50TmFtZSwgdHJ1 ZSk7CisgICAgcGF1c2VPbk5hdGl2ZUV2ZW50SWZOZWVkZWQoaW5zdHJ1bWVudGluZ0FnZW50cywg ZmFsc2UsIHNldFRpbWVyRXZlbnROYW1lLCB0cnVlKTsKICAgICBpZiAoSW5zcGVjdG9yVGltZWxp bmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvclRp bWVsaW5lQWdlbnQoKSkKICAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkSW5zdGFsbFRpbWVyKHRp bWVySWQsIHRpbWVvdXQsIHNpbmdsZVNob3QpOwogfQogCiB2b2lkIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6ZGlkUmVtb3ZlVGltZXJJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1l bnRpbmdBZ2VudHMsIGludCB0aW1lcklkKQogewotICAgIHBhdXNlT25OYXRpdmVFdmVudElmTmVl ZGVkKGluc3RydW1lbnRpbmdBZ2VudHMsIGluc3RydW1lbnRhdGlvbkV2ZW50Q2F0ZWdvcnlUeXBl LCBjbGVhclRpbWVyRXZlbnROYW1lLCB0cnVlKTsKKyAgICBwYXVzZU9uTmF0aXZlRXZlbnRJZk5l ZWRlZChpbnN0cnVtZW50aW5nQWdlbnRzLCBmYWxzZSwgY2xlYXJUaW1lckV2ZW50TmFtZSwgdHJ1 ZSk7CiAgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBpbnN0 cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCiAgICAgICAgIHRpbWVs aW5lQWdlbnQtPmRpZFJlbW92ZVRpbWVyKHRpbWVySWQpOwogfQpAQCAtMjkwLDcgKzI4Nyw3IEBA IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 OndpbGxEaXNwYXRjaEV2ZW50SW1wbChJCiAKIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tp ZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxIYW5kbGVFdmVudEltcGwoSW5zdHJ1bWVu dGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgRXZlbnQqIGV2ZW50KQogewotICAgIHBh dXNlT25OYXRpdmVFdmVudElmTmVlZGVkKGluc3RydW1lbnRpbmdBZ2VudHMsIGxpc3RlbmVyRXZl bnRDYXRlZ29yeVR5cGUsIGV2ZW50LT50eXBlKCksIGZhbHNlKTsKKyAgICBwYXVzZU9uTmF0aXZl RXZlbnRJZk5lZWRlZChpbnN0cnVtZW50aW5nQWdlbnRzLCB0cnVlLCBldmVudC0+dHlwZSgpLCBm YWxzZSk7CiAgICAgcmV0dXJuIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZShpbnN0cnVt ZW50aW5nQWdlbnRzLCAwKTsKIH0KIApAQCAtMzQwLDcgKzMzNyw3IEBAIHZvaWQgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpkaWRFdmFsdWF0ZVNjcmlwdEltcGwoY29uc3QgSW5zcGVjdG9ySW5z dHJ1bWVudGF0CiAKIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OndpbGxGaXJlVGltZXJJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3Ry dW1lbnRpbmdBZ2VudHMsIGludCB0aW1lcklkKQogewotICAgIHBhdXNlT25OYXRpdmVFdmVudElm TmVlZGVkKGluc3RydW1lbnRpbmdBZ2VudHMsIGluc3RydW1lbnRhdGlvbkV2ZW50Q2F0ZWdvcnlU eXBlLCB0aW1lckZpcmVkRXZlbnROYW1lLCBmYWxzZSk7CisgICAgcGF1c2VPbk5hdGl2ZUV2ZW50 SWZOZWVkZWQoaW5zdHJ1bWVudGluZ0FnZW50cywgZmFsc2UsIHRpbWVyRmlyZWRFdmVudE5hbWUs IGZhbHNlKTsKIAogICAgIGludCB0aW1lbGluZUFnZW50SWQgPSAwOwogICAgIGlmIChJbnNwZWN0 b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5z cGVjdG9yVGltZWxpbmVBZ2VudCgpKSB7CkBAIC05NjEsMTEgKzk1OCwxMSBAQCBib29sIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6aGFzRnJvbnRlbmRGb3JTY3JpcHRDb250ZXh0KFNjcmlwdEV4 ZWN1dGlvbkNvbnRleAogICAgIHJldHVybiBwYWdlICYmIHBhZ2UtPmluc3BlY3RvckNvbnRyb2xs ZXIoKS0+aGFzRnJvbnRlbmQoKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 OnBhdXNlT25OYXRpdmVFdmVudElmTmVlZGVkKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1l bnRpbmdBZ2VudHMsIGNvbnN0IFN0cmluZyYgY2F0ZWdvcnlUeXBlLCBjb25zdCBTdHJpbmcmIGV2 ZW50TmFtZSwgYm9vbCBzeW5jaHJvbm91cykKK3ZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjpwYXVzZU9uTmF0aXZlRXZlbnRJZk5lZWRlZChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVt ZW50aW5nQWdlbnRzLCBib29sIGlzRE9NRXZlbnQsIGNvbnN0IFN0cmluZyYgZXZlbnROYW1lLCBi b29sIHN5bmNocm9ub3VzKQogewogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQogICAg IGlmIChJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50KiBkb21EZWJ1Z2dlckFnZW50ID0gaW5zdHJ1 bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudCgpKQotICAgICAgICBkb21E ZWJ1Z2dlckFnZW50LT5wYXVzZU9uTmF0aXZlRXZlbnRJZk5lZWRlZChjYXRlZ29yeVR5cGUsIGV2 ZW50TmFtZSwgc3luY2hyb25vdXMpOworICAgICAgICBkb21EZWJ1Z2dlckFnZW50LT5wYXVzZU9u TmF0aXZlRXZlbnRJZk5lZWRlZChpc0RPTUV2ZW50LCBldmVudE5hbWUsIHN5bmNocm9ub3VzKTsK ICNlbmRpZgogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggMjk4MDk5YjNmNTliY2E0YmYzNGY2ODFkNTE4ZjgyZDM1 YzVlYjZlYi4uZDA0MzU1MTljNmMwNzBhODBlYWUyZmUxYzcxZjFjOWIwNTQ4NjU3YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24u aApAQCAtMzY3LDcgKzM2Nyw3IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIHN0YXRpYyBib29s IGNvbGxlY3RpbmdIVE1MUGFyc2VFcnJvcnMoSW5zdHJ1bWVudGluZ0FnZW50cyopOwotICAgIHN0 YXRpYyB2b2lkIHBhdXNlT25OYXRpdmVFdmVudElmTmVlZGVkKEluc3RydW1lbnRpbmdBZ2VudHMq LCBjb25zdCBTdHJpbmcmIGNhdGVnb3J5VHlwZSwgY29uc3QgU3RyaW5nJiBldmVudE5hbWUsIGJv b2wgc3luY2hyb25vdXMpOworICAgIHN0YXRpYyB2b2lkIHBhdXNlT25OYXRpdmVFdmVudElmTmVl ZGVkKEluc3RydW1lbnRpbmdBZ2VudHMqLCBib29sIGlzRE9NRXZlbnQsIGNvbnN0IFN0cmluZyYg ZXZlbnROYW1lLCBib29sIHN5bmNocm9ub3VzKTsKICAgICBzdGF0aWMgdm9pZCBjYW5jZWxQYXVz ZU9uTmF0aXZlRXZlbnQoSW5zdHJ1bWVudGluZ0FnZW50cyopOwogICAgIHN0YXRpYyBJbnNwZWN0 b3JUaW1lbGluZUFnZW50KiByZXRyaWV2ZVRpbWVsaW5lQWdlbnQoY29uc3QgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uQ29va2llJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcwppbmRleCBiY2E4 M2MwYjk1Yzc3OGVkNmQ5Zjc0Yjk2ZDgyZjcxYzY2OGQ5MTJlLi4zYmNmOGY1Y2MzZTE0MjgyYmJm MDJhOTU3ZjU2ZjkyMjBlYjkwYTgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzCkBAIC00NjEs MjIgKzQ2MSwyNSBAQCBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzU2lkZWJh clBhbmUgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5ib2R5RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz LmNhdGVnb3JpZXNFbGVtZW50KTsKIAogICAgIHRoaXMuX2JyZWFrcG9pbnRJdGVtcyA9IHt9Owot ICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KFdlYkluc3BlY3Rvci5VSVN0cmluZygiS2V5Ym9hcmQi KSwgImxpc3RlbmVyIiwgWyJrZXlkb3duIiwgImtleXVwIiwgImtleXByZXNzIiwgInRleHRJbnB1 dCJdKTsKLSAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk1v dXNlIiksICJsaXN0ZW5lciIsIFsiY2xpY2siLCAiZGJsY2xpY2siLCAibW91c2Vkb3duIiwgIm1v dXNldXAiLCAibW91c2VvdmVyIiwgIm1vdXNlbW92ZSIsICJtb3VzZW91dCIsICJtb3VzZXdoZWVs Il0pOworICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KFdlYkluc3BlY3Rvci5VSVN0cmluZygiS2V5 Ym9hcmQiKSwgdHJ1ZSwgWyJrZXlkb3duIiwgImtleXVwIiwgImtleXByZXNzIiwgInRleHRJbnB1 dCJdKTsKKyAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk1v dXNlIiksIHRydWUsIFsiY2xpY2siLCAiZGJsY2xpY2siLCAibW91c2Vkb3duIiwgIm1vdXNldXAi LCAibW91c2VvdmVyIiwgIm1vdXNlbW92ZSIsICJtb3VzZW91dCIsICJtb3VzZXdoZWVsIl0pOwog ICAgIC8vIEZJWE1FOiB1bmNvbW1lbnQgZm9sbG93aW5nIG9uY2UgaW5zcGVjdG9yIHN0b3BzIGJl aW5nIGRyb3AgdGFyZ2VyIGluIG1ham9yIHBvcnRzLgogICAgIC8vIE90aGVyd2lzZSwgaW5zcGVj dG9yIHBhZ2UgcmVhY3RzIG9uIGRyb3AgZXZlbnQgYW5kIHRyaWVzIHRvIGxvYWQgdGhlIGV2ZW50 IGRhdGEuCi0gICAgLy8gdGhpcy5fY3JlYXRlQ2F0ZWdvcnkoV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJEcmFnIiksICJsaXN0ZW5lciIsIFsiZHJhZyIsICJkcm9wIiwgImRyYWdzdGFydCIsICJkcmFn ZW5kIiwgImRyYWdlbnRlciIsICJkcmFnbGVhdmUiLCAiZHJhZ292ZXIiXSk7Ci0gICAgdGhpcy5f Y3JlYXRlQ2F0ZWdvcnkoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb250cm9sIiksICJsaXN0ZW5l ciIsIFsicmVzaXplIiwgInNjcm9sbCIsICJ6b29tIiwgImZvY3VzIiwgImJsdXIiLCAic2VsZWN0 IiwgImNoYW5nZSIsICJzdWJtaXQiLCAicmVzZXQiXSk7Ci0gICAgdGhpcy5fY3JlYXRlQ2F0ZWdv cnkoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGlwYm9hcmQiKSwgImxpc3RlbmVyIiwgWyJjb3B5 IiwgImN1dCIsICJwYXN0ZSIsICJiZWZvcmVjb3B5IiwgImJlZm9yZWN1dCIsICJiZWZvcmVwYXN0 ZSJdKTsKLSAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxv YWQiKSwgImxpc3RlbmVyIiwgWyJsb2FkIiwgInVubG9hZCIsICJhYm9ydCIsICJlcnJvciJdKTsK LSAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRPTSBNdXRh dGlvbiIpLCAibGlzdGVuZXIiLCBbIkRPTUFjdGl2YXRlIiwgIkRPTUZvY3VzSW4iLCAiRE9NRm9j dXNPdXQiLCAiRE9NQXR0ck1vZGlmaWVkIiwgIkRPTUNoYXJhY3RlckRhdGFNb2RpZmllZCIsICJE T01Ob2RlSW5zZXJ0ZWQiLCAiRE9NTm9kZUluc2VydGVkSW50b0RvY3VtZW50IiwgIkRPTU5vZGVS ZW1vdmVkIiwgIkRPTU5vZGVSZW1vdmVkRnJvbURvY3VtZW50IiwgIkRPTVN1YnRyZWVNb2RpZmll ZCIsICJET01Db250ZW50TG9hZGVkIl0pOwotICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KFdlYklu c3BlY3Rvci5VSVN0cmluZygiRGV2aWNlIiksICJsaXN0ZW5lciIsIFsiZGV2aWNlb3JpZW50YXRp b24iLCAiZGV2aWNlbW90aW9uIl0pOwotICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiVGltZXIiKSwgImluc3RydW1lbnRhdGlvbiIsIFsic2V0VGltZXIiLCAi Y2xlYXJUaW1lciIsICJ0aW1lckZpcmVkIl0pOwotICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KFdl Ykluc3BlY3Rvci5VSVN0cmluZygiVG91Y2giKSwgImxpc3RlbmVyIiwgWyJ0b3VjaHN0YXJ0Iiwg InRvdWNobW92ZSIsICJ0b3VjaGVuZCIsICJ0b3VjaGNhbmNlbCJdKTsKKyAgICAvLyB0aGlzLl9j cmVhdGVDYXRlZ29yeShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRyYWciKSwgdHJ1ZSwgWyJkcmFn IiwgImRyb3AiLCAiZHJhZ3N0YXJ0IiwgImRyYWdlbmQiLCAiZHJhZ2VudGVyIiwgImRyYWdsZWF2 ZSIsICJkcmFnb3ZlciJdKTsKKyAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeShXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkNvbnRyb2wiKSwgdHJ1ZSwgWyJyZXNpemUiLCAic2Nyb2xsIiwgInpvb20iLCAi Zm9jdXMiLCAiYmx1ciIsICJzZWxlY3QiLCAiY2hhbmdlIiwgInN1Ym1pdCIsICJyZXNldCJdKTsK KyAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsaXBib2Fy ZCIpLCB0cnVlLCBbImNvcHkiLCAiY3V0IiwgInBhc3RlIiwgImJlZm9yZWNvcHkiLCAiYmVmb3Jl Y3V0IiwgImJlZm9yZXBhc3RlIl0pOworICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiTG9hZCIpLCB0cnVlLCBbImxvYWQiLCAidW5sb2FkIiwgImFib3J0Iiwg ImVycm9yIl0pOworICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiRE9NIE11dGF0aW9uIiksIHRydWUsIFsiRE9NQWN0aXZhdGUiLCAiRE9NRm9jdXNJbiIsICJE T01Gb2N1c091dCIsICJET01BdHRyTW9kaWZpZWQiLCAiRE9NQ2hhcmFjdGVyRGF0YU1vZGlmaWVk IiwgIkRPTU5vZGVJbnNlcnRlZCIsICJET01Ob2RlSW5zZXJ0ZWRJbnRvRG9jdW1lbnQiLCAiRE9N Tm9kZVJlbW92ZWQiLCAiRE9NTm9kZVJlbW92ZWRGcm9tRG9jdW1lbnQiLCAiRE9NU3VidHJlZU1v ZGlmaWVkIiwgIkRPTUNvbnRlbnRMb2FkZWQiXSk7CisgICAgdGhpcy5fY3JlYXRlQ2F0ZWdvcnko V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZXZpY2UiKSwgdHJ1ZSwgWyJkZXZpY2VvcmllbnRhdGlv biIsICJkZXZpY2Vtb3Rpb24iXSk7CisgICAgdGhpcy5fY3JlYXRlQ2F0ZWdvcnkoV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJUaW1lciIpLCBmYWxzZSwgWyJzZXRUaW1lciIsICJjbGVhclRpbWVyIiwg InRpbWVyRmlyZWQiXSk7CisgICAgdGhpcy5fY3JlYXRlQ2F0ZWdvcnkoV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJUb3VjaCIpLCB0cnVlLCBbInRvdWNoc3RhcnQiLCAidG91Y2htb3ZlIiwgInRvdWNo ZW5kIiwgInRvdWNoY2FuY2VsIl0pOwogCiAgICAgdGhpcy5fcmVzdG9yZUJyZWFrcG9pbnRzKCk7 CiB9CiAKK1dlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5j YXRlZ290eUxpc3RlbmVyID0gImxpc3RlbmVyOiI7CitXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5l ckJyZWFrcG9pbnRzU2lkZWJhclBhbmUuY2F0ZWdvdHlJbnN0cnVtZW50YXRpb24gPSAiaW5zdHJ1 bWVudGF0aW9uOiI7CisKIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRl YmFyUGFuZS5ldmVudE5hbWVGb3JVSSA9IGZ1bmN0aW9uKGV2ZW50TmFtZSkKIHsKICAgICBpZiAo IVdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5fZXZlbnRO YW1lc0ZvclVJKSB7CkBAIC00OTAsNyArNDkzLDcgQEAgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVu ZXJCcmVha3BvaW50c1NpZGViYXJQYW5lLmV2ZW50TmFtZUZvclVJID0gZnVuY3Rpb24oZXZlbnQK IH0KIAogV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJCcmVha3BvaW50c1NpZGViYXJQYW5lLnBy b3RvdHlwZSA9IHsKLSAgICBfY3JlYXRlQ2F0ZWdvcnk6IGZ1bmN0aW9uKG5hbWUsIHR5cGUsIGV2 ZW50TmFtZXMpCisgICAgX2NyZWF0ZUNhdGVnb3J5OiBmdW5jdGlvbihuYW1lLCBpc0RPTUV2ZW50 LCBldmVudE5hbWVzKQogICAgIHsKICAgICAgICAgdmFyIGNhdGVnb3J5SXRlbSA9IHt9OwogICAg ICAgICBjYXRlZ29yeUl0ZW0uZWxlbWVudCA9IG5ldyBUcmVlRWxlbWVudChuYW1lKTsKQEAgLTUw Myw3ICs1MDYsNyBAQCBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzU2lkZWJh clBhbmUucHJvdG90eXBlID0gewogCiAgICAgICAgIGNhdGVnb3J5SXRlbS5jaGlsZHJlbiA9IHt9 OwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGV2ZW50TmFtZXMubGVuZ3RoOyArK2kpIHsK LSAgICAgICAgICAgIHZhciBldmVudE5hbWUgPSB0eXBlICsgIjoiICsgZXZlbnROYW1lc1tpXTsK KyAgICAgICAgICAgIHZhciBldmVudE5hbWUgPSAoaXNET01FdmVudCA/IFdlYkluc3BlY3Rvci5F dmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5jYXRlZ290eUxpc3RlbmVyIDogIFdl Ykluc3BlY3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5jYXRlZ290eUlu c3RydW1lbnRhdGlvbikgKyBldmVudE5hbWVzW2ldOwogCiAgICAgICAgICAgICB2YXIgYnJlYWtw b2ludEl0ZW0gPSB7fTsKICAgICAgICAgICAgIHZhciB0aXRsZSA9IFdlYkluc3BlY3Rvci5FdmVu dExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5ldmVudE5hbWVGb3JVSShldmVudE5hbWUp OwpAQCAtNTYzLDcgKzU2NiwxMCBAQCBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJyZWFrcG9p bnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIWJyZWFrcG9pbnRJdGVt KQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBicmVha3BvaW50SXRlbS5jaGVja2JveC5j aGVja2VkID0gdHJ1ZTsKLSAgICAgICAgRE9NRGVidWdnZXJBZ2VudC5zZXRFdmVudExpc3RlbmVy QnJlYWtwb2ludChldmVudE5hbWUpOworICAgICAgICBpZiAoZXZlbnROYW1lLmluZGV4T2YoV2Vi SW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJCcmVha3BvaW50c1NpZGViYXJQYW5lLmNhdGVnb3R5TGlz dGVuZXIpID09PSAwKQorICAgICAgICAgICAgRE9NRGVidWdnZXJBZ2VudC5zZXRFdmVudExpc3Rl bmVyQnJlYWtwb2ludChldmVudE5hbWUuc3Vic3RyaW5nKFdlYkluc3BlY3Rvci5FdmVudExpc3Rl bmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5jYXRlZ290eUxpc3RlbmVyLmxlbmd0aCkpOworICAg ICAgICBlbHNlIGlmIChldmVudE5hbWUuaW5kZXhPZihXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5l ckJyZWFrcG9pbnRzU2lkZWJhclBhbmUuY2F0ZWdvdHlJbnN0cnVtZW50YXRpb24pID09PSAwKQor ICAgICAgICAgICAgRE9NRGVidWdnZXJBZ2VudC5zZXRJbnN0cnVtZW50YXRpb25CcmVha3BvaW50 KGV2ZW50TmFtZS5zdWJzdHJpbmcoV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJCcmVha3BvaW50 c1NpZGViYXJQYW5lLmNhdGVnb3R5SW5zdHJ1bWVudGF0aW9uLmxlbmd0aCkpOwogICAgICAgICB0 aGlzLl91cGRhdGVDYXRlZ29yeUNoZWNrYm94KGJyZWFrcG9pbnRJdGVtLnBhcmVudCk7CiAgICAg fSwKIApAQCAtNTczLDcgKzU3OSwxMCBAQCBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJyZWFr cG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIWJyZWFrcG9pbnRJ dGVtKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBicmVha3BvaW50SXRlbS5jaGVja2Jv eC5jaGVja2VkID0gZmFsc2U7Ci0gICAgICAgIERPTURlYnVnZ2VyQWdlbnQucmVtb3ZlRXZlbnRM aXN0ZW5lckJyZWFrcG9pbnQoZXZlbnROYW1lKTsKKyAgICAgICAgaWYgKGV2ZW50TmFtZS5pbmRl eE9mKFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5jYXRl Z290eUxpc3RlbmVyKSA9PT0gMCkKKyAgICAgICAgICAgIERPTURlYnVnZ2VyQWdlbnQucmVtb3Zl RXZlbnRMaXN0ZW5lckJyZWFrcG9pbnQoZXZlbnROYW1lLnN1YnN0cmluZyhXZWJJbnNwZWN0b3Iu RXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzU2lkZWJhclBhbmUuY2F0ZWdvdHlMaXN0ZW5lci5sZW5n dGgpKTsKKyAgICAgICAgZWxzZSBpZiAoZXZlbnROYW1lLmluZGV4T2YoV2ViSW5zcGVjdG9yLkV2 ZW50TGlzdGVuZXJCcmVha3BvaW50c1NpZGViYXJQYW5lLmNhdGVnb3R5SW5zdHJ1bWVudGF0aW9u KSA9PT0gMCkKKyAgICAgICAgICAgIERPTURlYnVnZ2VyQWdlbnQucmVtb3ZlSW5zdHJ1bWVudGF0 aW9uQnJlYWtwb2ludChldmVudE5hbWUuc3Vic3RyaW5nKFdlYkluc3BlY3Rvci5FdmVudExpc3Rl bmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5jYXRlZ290eUluc3RydW1lbnRhdGlvbi5sZW5ndGgp KTsKICAgICAgICAgdGhpcy5fdXBkYXRlQ2F0ZWdvcnlDaGVja2JveChicmVha3BvaW50SXRlbS5w YXJlbnQpOwogICAgIH0sCiAK