126018 2013-12-19 14:14:06 -0800 Web Inspector: Uncaught Exception: NavigationSidebarPanel.js: ERROR: TypeError: undefined is not a function (evaluating 'representedObject.saveIdentityToCookie(candidateObjectCookie)') 2013-12-19 17:56:58 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 joepeck joepeck burg commit-queue eflews.bot graouts gyuyoung.kim joepeck timothy webkit-bug-importer oldest_to_newest 961540 0 joepeck 2013-12-19 14:14:06 -0800 SUMMARY: file:///Volumes/Data/Build/Debug/WebInspectorUI.framework/Resources/NavigationSidebarPanel.js:582:51:JS ERROR: TypeError: undefined is not a function (evaluating 'representedObject.saveIdentityToCookie(candidateObjectCookie)') STEPS TO REPRODUCE: 1. Open Inspector for <http://bogojoker.com> 2. Inspect the Inspector (I typically do by the Resources Sidebar) => Exception in console, inspector² is broken 961541 1 joepeck 2013-12-19 14:19:28 -0800 Seems like the issue crops up when the item I have selected in the Resources Navigation sidebar is a FolderTreeElement, like "Scripts". 961543 2 joepeck 2013-12-19 14:23:08 -0800 Yes. All new WebInspector.FolderTreeElement's are passed a representedObject of null or undefined. Eventually in TreeElement, that becomes just an empty object: this.representedObject = (representedObject || {}); Which is what I'm seeing here. 961550 3 219685 joepeck 2013-12-19 14:53:10 -0800 Created attachment 219685 [PATCH] Proposed Fix 961633 4 219685 eflews.bot 2013-12-19 16:56:39 -0800 Comment on attachment 219685 [PATCH] Proposed Fix Attachment 219685 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/50568041 961641 5 219706 joepeck 2013-12-19 17:01:31 -0800 Created attachment 219706 [PATCH] Proposed Fix On IRC the feedback was we should still be resilient against a missing representedObject.saveIdentityToCookie. So I added the if check, and console.error warn if it didn't exist. 961663 6 219706 commit-queue 2013-12-19 17:56:56 -0800 Comment on attachment 219706 [PATCH] Proposed Fix Clearing flags on attachment: 219706 Committed r160888: <http://trac.webkit.org/changeset/160888> 961664 7 commit-queue 2013-12-19 17:56:58 -0800 All reviewed patches have been landed. Closing bug. 219685 2013-12-19 14:53:10 -0800 2013-12-19 17:01:31 -0800 [PATCH] Proposed Fix treeelement.patch text/plain 3980 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNmNWMwZGEuLjBkNWFlMTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEyLTE5ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVW5jYXVn aHQgRXhjZXB0aW9uOiBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzOiBUeXBlRXJyb3I6IHVuZGVm aW5lZCBpcyBub3QgYSBmdW5jdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI2MDE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRVJST1I6IFR5cGVFcnJvcjogdW5kZWZpbmVkIGlzIG5vdCBhIGZ1bmN0 aW9uIChldmFsdWF0aW5nICdyZXByZXNlbnRlZE9iamVjdC5zYXZlSWRlbnRpdHlUb0Nvb2tpZShj YW5kaWRhdGVPYmplY3RDb29raWUpJykKKworICAgICAgICBUaGVyZSBhcmUgc29tZSBUcmVlRWxl bWVudHMgKEZvbGRlcnMsIGFuZCB0aGUgc3BlY2lhbCBEYXRhYmFzZXMgRm9sZGVyKQorICAgICAg ICB3aGljaCBkbyBub3QgaGF2ZSBhIHJlcHJlc2VudGVkIG9iamVjdCwgYW5kIHdvdWxkIHRocm93 IGFuIGV4Y2VwdGlvbgorICAgICAgICB3aGVuIHRyeWluZyB0byB1c2Ugc2F2ZUlkZW50aXR5VG9D b29raWUuCisKKyAgICAgICAgV2Ugc2hvdWxkIGFsd2F5cyBwcm92aWRlIGEgc2F2ZUlkZW50aXR5 VG9Db29raWUgd2hlbiBwb3NzaWJsZS4gU28ganVzdAorICAgICAgICBibGFja2xpc3QgdGhlIHRy ZWUgZWxlbWVudCB0eXBlcyB3ZSBrbm93IGRvIG5vdCBoYXZlIHJlcHJlc2VudGVkT2JqZWN0cywK KyAgICAgICAgYW5kIHdoZXJlIHdlIGRvbid0IHdhbnQgdG8gc2F2ZSBpZGVudGl0eS4gVGhpcyB3 aWxsIGNvbnRpbnVlIHRvIHRocm93CisgICAgICAgIGV4Y2VwdGlvbnMgaW4gdGhlIGZ1dHVyZSBm b3IgdHJlZSBlbGVtZW50cyB0aGF0IGRvbid0IGhhdmUgdGhlIHNhdmUKKyAgICAgICAgZnVuY3Rp b24gaW1wbGVtZW50ZWQsIGJ1dCBzaG91bGQuCisKKyAgICAgICAgTm90ZSB0aGF0IGV2ZW4gaWYg YSBUcmVlRWxlbWVudCBpcyBjb25zdHJ1Y3RlZCB3aXRoIGEgbnVsbCByZXByZXNlbnRlZAorICAg ICAgICBvYmplY3QsIGl0IGJlY29tZXMgYW4gZW1wdHkgb2JqZWN0IChyZXByZXNlbnRlZE9iamVj dCB8fCB7fSkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL05hdmlnYXRpb25TaWRlYmFyUGFu ZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90 b3R5cGUuc2F2ZVN0YXRlVG9Db29raWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRp b25TaWRlYmFyUGFuZWwucHJvdG90eXBlLl9pc1RyZWVFbGVtZW50V2l0aG91dFJlcHJlc2VudGVk T2JqZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnBy b3RvdHlwZS50cmVlRWxlbWVudE1hdGNoZXNDb29raWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLl9jaGVja0VsZW1lbnRzRm9yUGVuZGlu Z1ZpZXdTdGF0ZUNvb2tpZSk6CisKIDIwMTMtMTItMTYgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hy aXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBGaXhlZCBXaW42NCBidWlsZCBvbiBWUzIw MTMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9OYXZp Z2F0aW9uU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwppbmRleCA1MjU0NzZlLi4xYWM1YWU3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9OYXZpZ2F0aW9uU2lk ZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL05h dmlnYXRpb25TaWRlYmFyUGFuZWwuanMKQEAgLTIwMSw2ICsyMDEsOSBAQCBXZWJJbnNwZWN0b3Iu TmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghc2VsZWN0 ZWRUcmVlRWxlbWVudCkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICBpZiAodGhpcy5f aXNUcmVlRWxlbWVudFdpdGhvdXRSZXByZXNlbnRlZE9iamVjdChzZWxlY3RlZFRyZWVFbGVtZW50 KSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICB2YXIgcmVwcmVzZW50ZWRPYmplY3Qg PSBzZWxlY3RlZFRyZWVFbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0OwogICAgICAgICBjb29raWVb V2ViSW5zcGVjdG9yLlR5cGVJZGVudGlmaWVyQ29va2llS2V5XSA9IHJlcHJlc2VudGVkT2JqZWN0 LmNvbnN0cnVjdG9yLlR5cGVJZGVudGlmaWVyOwogICAgICAgICByZXByZXNlbnRlZE9iamVjdC5z YXZlSWRlbnRpdHlUb0Nvb2tpZShjb29raWUpOwpAQCAtNTQxLDYgKzU0NCwxMiBAQCBXZWJJbnNw ZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMu X2NoZWNrRm9yT2xkUmVzb3VyY2VzVGltZW91dElkZW50aWZpZXIgPSBzZXRUaW1lb3V0KGRlbGF5 ZWRXb3JrLmJpbmQodGhpcyksIDApOwogICAgIH0sCiAKKyAgICBfaXNUcmVlRWxlbWVudFdpdGhv dXRSZXByZXNlbnRlZE9iamVjdDogZnVuY3Rpb24odHJlZUVsZW1lbnQpCisgICAgeworICAgICAg ICByZXR1cm4gdHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuRm9sZGVyVHJlZUVs ZW1lbnQKKyAgICAgICAgICAgIHx8IHRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9y LkRhdGFiYXNlSG9zdFRyZWVFbGVtZW50OworICAgIH0sCisKICAgICBfY2hlY2tPdXRsaW5lc0Zv clBlbmRpbmdWaWV3U3RhdGVDb29raWU6IGZ1bmN0aW9uKG1hdGNoVHlwZU9ubHkpCiAgICAgewog ICAgICAgICBpZiAoIXRoaXMuX3BlbmRpbmdWaWV3U3RhdGVDb29raWUpCkBAIC01NjcsNiArNTc2 LDkgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewog CiAgICAgICAgIGZ1bmN0aW9uIHRyZWVFbGVtZW50TWF0Y2hlc0Nvb2tpZSh0cmVlRWxlbWVudCkK ICAgICAgICAgeworICAgICAgICAgICAgaWYgKHRoaXMuX2lzVHJlZUVsZW1lbnRXaXRob3V0UmVw cmVzZW50ZWRPYmplY3QodHJlZUVsZW1lbnQpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKwogICAgICAgICAgICAgdmFyIHJlcHJlc2VudGVkT2JqZWN0ID0gdHJlZUVsZW1lbnQucmVw cmVzZW50ZWRPYmplY3Q7CiAgICAgICAgICAgICBpZiAoIXJlcHJlc2VudGVkT2JqZWN0KQogICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTU5MSwxMSArNjAzLDExIEBAIFdlYkluc3Bl Y3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIg bWF0Y2hlZEVsZW1lbnQgPSBudWxsOwogICAgICAgICB0cmVlRWxlbWVudHMuc29tZShmdW5jdGlv bihlbGVtZW50KSB7Ci0gICAgICAgICAgICBpZiAodHJlZUVsZW1lbnRNYXRjaGVzQ29va2llKGVs ZW1lbnQpKSB7CisgICAgICAgICAgICBpZiAodHJlZUVsZW1lbnRNYXRjaGVzQ29va2llLmNhbGwo dGhpcywgZWxlbWVudCkpIHsKICAgICAgICAgICAgICAgICBtYXRjaGVkRWxlbWVudCA9IGVsZW1l bnQ7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9Ci0gICAgICAg IH0pOworICAgICAgICB9LCB0aGlzKTsKIAogICAgICAgICBpZiAobWF0Y2hlZEVsZW1lbnQpIHsK ICAgICAgICAgICAgIG1hdGNoZWRFbGVtZW50LnJldmVhbEFuZFNlbGVjdCgpOwo= 219706 2013-12-19 17:01:31 -0800 2013-12-19 17:56:56 -0800 [PATCH] Proposed Fix better-throw.patch text/plain 4928 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNmNWMwZGEuLjBkNWFlMTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEyLTE5ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVW5jYXVn aHQgRXhjZXB0aW9uOiBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzOiBUeXBlRXJyb3I6IHVuZGVm aW5lZCBpcyBub3QgYSBmdW5jdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI2MDE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRVJST1I6IFR5cGVFcnJvcjogdW5kZWZpbmVkIGlzIG5vdCBhIGZ1bmN0 aW9uIChldmFsdWF0aW5nICdyZXByZXNlbnRlZE9iamVjdC5zYXZlSWRlbnRpdHlUb0Nvb2tpZShj YW5kaWRhdGVPYmplY3RDb29raWUpJykKKworICAgICAgICBUaGVyZSBhcmUgc29tZSBUcmVlRWxl bWVudHMgKEZvbGRlcnMsIGFuZCB0aGUgc3BlY2lhbCBEYXRhYmFzZXMgRm9sZGVyKQorICAgICAg ICB3aGljaCBkbyBub3QgaGF2ZSBhIHJlcHJlc2VudGVkIG9iamVjdCwgYW5kIHdvdWxkIHRocm93 IGFuIGV4Y2VwdGlvbgorICAgICAgICB3aGVuIHRyeWluZyB0byB1c2Ugc2F2ZUlkZW50aXR5VG9D b29raWUuCisKKyAgICAgICAgV2Ugc2hvdWxkIGFsd2F5cyBwcm92aWRlIGEgc2F2ZUlkZW50aXR5 VG9Db29raWUgd2hlbiBwb3NzaWJsZS4gU28ganVzdAorICAgICAgICBibGFja2xpc3QgdGhlIHRy ZWUgZWxlbWVudCB0eXBlcyB3ZSBrbm93IGRvIG5vdCBoYXZlIHJlcHJlc2VudGVkT2JqZWN0cywK KyAgICAgICAgYW5kIHdoZXJlIHdlIGRvbid0IHdhbnQgdG8gc2F2ZSBpZGVudGl0eS4gVGhpcyB3 aWxsIGNvbnRpbnVlIHRvIHRocm93CisgICAgICAgIGV4Y2VwdGlvbnMgaW4gdGhlIGZ1dHVyZSBm b3IgdHJlZSBlbGVtZW50cyB0aGF0IGRvbid0IGhhdmUgdGhlIHNhdmUKKyAgICAgICAgZnVuY3Rp b24gaW1wbGVtZW50ZWQsIGJ1dCBzaG91bGQuCisKKyAgICAgICAgTm90ZSB0aGF0IGV2ZW4gaWYg YSBUcmVlRWxlbWVudCBpcyBjb25zdHJ1Y3RlZCB3aXRoIGEgbnVsbCByZXByZXNlbnRlZAorICAg ICAgICBvYmplY3QsIGl0IGJlY29tZXMgYW4gZW1wdHkgb2JqZWN0IChyZXByZXNlbnRlZE9iamVj dCB8fCB7fSkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL05hdmlnYXRpb25TaWRlYmFyUGFu ZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90 b3R5cGUuc2F2ZVN0YXRlVG9Db29raWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRp b25TaWRlYmFyUGFuZWwucHJvdG90eXBlLl9pc1RyZWVFbGVtZW50V2l0aG91dFJlcHJlc2VudGVk T2JqZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnBy b3RvdHlwZS50cmVlRWxlbWVudE1hdGNoZXNDb29raWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLl9jaGVja0VsZW1lbnRzRm9yUGVuZGlu Z1ZpZXdTdGF0ZUNvb2tpZSk6CisKIDIwMTMtMTItMTYgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hy aXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBGaXhlZCBXaW42NCBidWlsZCBvbiBWUzIw MTMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9OYXZp Z2F0aW9uU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwppbmRleCA1MjU0NzZlLi5hYmRjZjNkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9OYXZpZ2F0aW9uU2lk ZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL05h dmlnYXRpb25TaWRlYmFyUGFuZWwuanMKQEAgLTIwMSw5ICsyMDEsMTYgQEAgV2ViSW5zcGVjdG9y Lk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXNlbGVj dGVkVHJlZUVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgaWYgKHRoaXMu X2lzVHJlZUVsZW1lbnRXaXRob3V0UmVwcmVzZW50ZWRPYmplY3Qoc2VsZWN0ZWRUcmVlRWxlbWVu dCkpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgdmFyIHJlcHJlc2VudGVkT2JqZWN0 ID0gc2VsZWN0ZWRUcmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdDsKICAgICAgICAgY29va2ll W1dlYkluc3BlY3Rvci5UeXBlSWRlbnRpZmllckNvb2tpZUtleV0gPSByZXByZXNlbnRlZE9iamVj dC5jb25zdHJ1Y3Rvci5UeXBlSWRlbnRpZmllcjsKLSAgICAgICAgcmVwcmVzZW50ZWRPYmplY3Qu c2F2ZUlkZW50aXR5VG9Db29raWUoY29va2llKTsKKworICAgICAgICBpZiAocmVwcmVzZW50ZWRP YmplY3Quc2F2ZUlkZW50aXR5VG9Db29raWUpCisgICAgICAgICAgICByZXByZXNlbnRlZE9iamVj dC5zYXZlSWRlbnRpdHlUb0Nvb2tpZShjb29raWUpOworICAgICAgICBlbHNlCisgICAgICAgICAg ICBjb25zb2xlLmVycm9yKCJFcnJvcjogVHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3QgaXMg bWlzc2luZyBhIHNhdmVJZGVudGl0eVRvQ29va2llIGltcGxlbWVudGF0aW9uLiBUcmVlRWxlbWVu dC5jb25zdHJ1Y3RvcjogJXMiLCBzZWxlY3RlZFRyZWVFbGVtZW50LmNvbnN0cnVjdG9yKTsKICAg ICB9LAogCiAgICAgLy8gVGhpcyBjYW4gYmUgc3VwcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMgdGhh dCBhZG1pdCBhIHNpbXBsZXIgc3RyYXRlZ3kgZm9yIHN0YXRpYyB0cmVlIGVsZW1lbnRzLgpAQCAt NTQxLDYgKzU0OCwxMiBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2NoZWNrRm9yT2xkUmVzb3VyY2VzVGltZW91dElkZW50 aWZpZXIgPSBzZXRUaW1lb3V0KGRlbGF5ZWRXb3JrLmJpbmQodGhpcyksIDApOwogICAgIH0sCiAK KyAgICBfaXNUcmVlRWxlbWVudFdpdGhvdXRSZXByZXNlbnRlZE9iamVjdDogZnVuY3Rpb24odHJl ZUVsZW1lbnQpCisgICAgeworICAgICAgICByZXR1cm4gdHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBX ZWJJbnNwZWN0b3IuRm9sZGVyVHJlZUVsZW1lbnQKKyAgICAgICAgICAgIHx8IHRyZWVFbGVtZW50 IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkRhdGFiYXNlSG9zdFRyZWVFbGVtZW50OworICAgIH0s CisKICAgICBfY2hlY2tPdXRsaW5lc0ZvclBlbmRpbmdWaWV3U3RhdGVDb29raWU6IGZ1bmN0aW9u KG1hdGNoVHlwZU9ubHkpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX3BlbmRpbmdWaWV3U3Rh dGVDb29raWUpCkBAIC01NjcsNiArNTgwLDkgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRl YmFyUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIGZ1bmN0aW9uIHRyZWVFbGVtZW50TWF0 Y2hlc0Nvb2tpZSh0cmVlRWxlbWVudCkKICAgICAgICAgeworICAgICAgICAgICAgaWYgKHRoaXMu X2lzVHJlZUVsZW1lbnRXaXRob3V0UmVwcmVzZW50ZWRPYmplY3QodHJlZUVsZW1lbnQpKQorICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgICAgICAgICAgdmFyIHJlcHJlc2VudGVk T2JqZWN0ID0gdHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3Q7CiAgICAgICAgICAgICBpZiAo IXJlcHJlc2VudGVkT2JqZWN0KQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTU3 OSw3ICs1OTUsOCBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAgICAgICAgIHZhciBj YW5kaWRhdGVPYmplY3RDb29raWUgPSB7fTsKLSAgICAgICAgICAgIHJlcHJlc2VudGVkT2JqZWN0 LnNhdmVJZGVudGl0eVRvQ29va2llKGNhbmRpZGF0ZU9iamVjdENvb2tpZSk7CisgICAgICAgICAg ICBpZiAocmVwcmVzZW50ZWRPYmplY3Quc2F2ZUlkZW50aXR5VG9Db29raWUpCisgICAgICAgICAg ICAgICAgcmVwcmVzZW50ZWRPYmplY3Quc2F2ZUlkZW50aXR5VG9Db29raWUoY2FuZGlkYXRlT2Jq ZWN0Q29va2llKTsKIAogICAgICAgICAgICAgcmV0dXJuIE9iamVjdC5rZXlzKGNhbmRpZGF0ZU9i amVjdENvb2tpZSkuZXZlcnkoZnVuY3Rpb24gdmFsdWVzTWF0Y2hGb3JLZXkoa2V5KSB7CiAgICAg ICAgICAgICAgICAgcmV0dXJuIGNhbmRpZGF0ZU9iamVjdENvb2tpZVtrZXldID09PSBjb29raWVb a2V5XTsKQEAgLTU5MSwxMSArNjA4LDExIEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJh clBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgbWF0Y2hlZEVsZW1lbnQgPSBudWxs OwogICAgICAgICB0cmVlRWxlbWVudHMuc29tZShmdW5jdGlvbihlbGVtZW50KSB7Ci0gICAgICAg ICAgICBpZiAodHJlZUVsZW1lbnRNYXRjaGVzQ29va2llKGVsZW1lbnQpKSB7CisgICAgICAgICAg ICBpZiAodHJlZUVsZW1lbnRNYXRjaGVzQ29va2llLmNhbGwodGhpcywgZWxlbWVudCkpIHsKICAg ICAgICAgICAgICAgICBtYXRjaGVkRWxlbWVudCA9IGVsZW1lbnQ7CiAgICAgICAgICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9Ci0gICAgICAgIH0pOworICAgICAgICB9LCB0aGlz KTsKIAogICAgICAgICBpZiAobWF0Y2hlZEVsZW1lbnQpIHsKICAgICAgICAgICAgIG1hdGNoZWRF bGVtZW50LnJldmVhbEFuZFNlbGVjdCgpOwo=