190989 2018-10-27 11:01:07 -0700 Web Inspector: refactor code for getting properties via WI.RemoteObject 2018-10-29 16:30:45 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 190754 1 hi hi commit-queue ews-watchlist hi inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1472719 0 hi 2018-10-27 11:01:07 -0700 Provide a way for callers to retrieve properties on a `WI.RemoteObject` without generating a preview. Additionally, centralize all the different functions into one main pathway. 1472724 1 353239 hi 2018-10-27 11:05:14 -0700 Created attachment 353239 Patch 1472727 2 ews-watchlist 2018-10-27 11:09:13 -0700 Attachment 353239 did not pass style-queue: ERROR: Source/WebInspectorUI/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] ERROR: LayoutTests/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 2 in 14 files If any of these errors are false positives, please file a bug against check-webkit-style. 1472731 3 353243 hi 2018-10-27 11:11:41 -0700 Created attachment 353243 Patch Whoops. Forgot bug number. 1473099 4 353243 mattbaker 2018-10-29 16:04:20 -0700 Comment on attachment 353243 Patch r=me 1473105 5 353243 commit-queue 2018-10-29 16:29:21 -0700 Comment on attachment 353243 Patch Clearing flags on attachment: 353243 Committed r237571: <https://trac.webkit.org/changeset/237571> 1473106 6 commit-queue 2018-10-29 16:29:23 -0700 All reviewed patches have been landed. Closing bug. 1473108 7 webkit-bug-importer 2018-10-29 16:30:45 -0700 <rdar://problem/45654001> 353239 2018-10-27 11:05:14 -0700 2018-10-27 11:11:41 -0700 Patch remoteObject.diff text/plain 16826 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkOWY1YzVhYjA4MC4uZWVkMzZlN2E3YzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAor MjAxOC0xMC0yNiAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAg V2ViIEluc3BlY3RvcjogcmVmYWN0b3IgY29kZSBmb3IgZ2V0dGluZyBwcm9wZXJ0aWVzIHZpYSBX SS5SZW1vdGVPYmplY3QKKyAgICAgICAgTmVlZCB0aGUgYnVnIFVSTCAoT09QUyEpLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9p bnNwZWN0b3IvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1ZXN0LWludGVybmFsLXByb3BlcnRp ZXMuaHR0cHMuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvYnJlYWtwb2ludC1z Y29wZS5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9wYXVzZWQtc2NvcGVzLmh0 bWw6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3RhaWwtZGVsZXRlZC1mcmFtZXMtZnJv bS12bS1lbnRyeS5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci90YWlsLWRlbGV0 ZWQtZnJhbWVzLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3RhaWwtcmVjdXJz aW9uLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QtZmFrZS1v YmplY3QuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC1nZXQt cHJvcGVydGllcy5odG1sOgorCiAyMDE4LTEwLTI2ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0Bh cHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBBbmltYXRpb25zXSBSZW1vdmUgdXNlbGVzcyBpbnRl cm5hbHMgbWV0aG9kcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0 b3IvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1ZXN0LWludGVybmFsLXByb3BlcnRpZXMuaHR0 cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3BheW1lbnRyZXF1ZXN0 L3BheW1lbnQtcmVxdWVzdC1pbnRlcm5hbC1wcm9wZXJ0aWVzLmh0dHBzLmh0bWwKaW5kZXggYjcw NTk3MTdmOTUuLjYxNjg5OTk2OGE0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L2luc3BlY3Rvci9wYXltZW50cmVxdWVzdC9wYXltZW50LXJlcXVlc3QtaW50ZXJuYWwtcHJvcGVy dGllcy5odHRwcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Bh eW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1pbnRlcm5hbC1wcm9wZXJ0aWVzLmh0dHBzLmh0 bWwKQEAgLTEzNSw3ICsxMzUsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZShleHByZXNzaW9uLCBudWxsLCB7cmVtb3Rl T2JqZWN0T25seTogdHJ1ZX0pLAogICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmF3 YWl0RXZlbnQoIkNvbnRpbnVlIiksCiAgICAgICAgICAgICAgICAgXSk7Ci0gICAgICAgICAgICAg ICAgbGV0IFtwcm9wZXJ0eURlc2NyaXB0b3JzXSA9IGF3YWl0IHByb21pc2lmeSgoY2IpID0+IHsg cmVtb3RlT2JqZWN0LmdldEFsbFByb3BlcnR5RGVzY3JpcHRvcnMoY2IpOyB9KTsKKyAgICAgICAg ICAgICAgICBsZXQgW3Byb3BlcnR5RGVzY3JpcHRvcnNdID0gYXdhaXQgcHJvbWlzaWZ5KChjYikg PT4geyByZW1vdGVPYmplY3QuZ2V0UHJvcGVydHlEZXNjcmlwdG9ycyhjYik7IH0pOwogICAgICAg ICAgICAgICAgIGZvciAobGV0IHByb3BlcnR5RGVzY3JpcHRvciBvZiBwcm9wZXJ0eURlc2NyaXB0 b3JzLnJldmVyc2UoKSkgewogICAgICAgICAgICAgICAgICAgICBpZiAocHJvcGVydHlEZXNjcmlw dG9yLmlzSW50ZXJuYWxQcm9wZXJ0eSkgewogICAgICAgICAgICAgICAgICAgICAgICAgbGV0IGRp c3BsYXlTdHJpbmcgPSBhd2FpdCBwcm9wZXJ0eURlc2NyaXB0b3JTdHJpbmcocHJvcGVydHlEZXNj cmlwdG9yKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9icmVh a3BvaW50LXNjb3BlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvYnJlYWtw b2ludC1zY29wZS5odG1sCmluZGV4IGM2NDZmNzA3ZWNiLi4yNDExNDQ2MDhkOCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2JyZWFrcG9pbnQtc2NvcGUuaHRtbAor KysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvYnJlYWtwb2ludC1zY29wZS5odG1s CkBAIC01Nyw3ICs1Nyw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICBmb3IgKHZhciBzY29w ZSBvZiBzY29wZUNoYWluKSB7CiAgICAgICAgICAgICBzY29wZVR5cGVzLnB1c2goc2NvcGUudHlw ZSk7CiAgICAgICAgICAgICBpZiAoc2NvcGUudHlwZSAhPT0gV0kuU2NvcGVDaGFpbk5vZGUuVHlw ZS5HbG9iYWwpIHsKLSAgICAgICAgICAgICAgICBzY29wZS5vYmplY3RzWzBdLmdldEFsbFByb3Bl cnR5RGVzY3JpcHRvcnMoZnVuY3Rpb24ocHJvcGVydGllcykgeworICAgICAgICAgICAgICAgIHNj b3BlLm9iamVjdHNbMF0uZ2V0UHJvcGVydHlEZXNjcmlwdG9ycyhmdW5jdGlvbihwcm9wZXJ0aWVz KSB7CiAgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKHNjb3BlVHlwZXNbc2Nv cGVUeXBlSW5kZXgrK10gKyAiIHByb3BlcnRpZXM6Iik7CiAgICAgICAgICAgICAgICAgICAgIGZv ciAodmFyIHByb3BlcnR5RGVzY3JpcHRvciBvZiBwcm9wZXJ0aWVzKQogICAgICAgICAgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIiAgICAiICsgcHJvcGVydHlEZXNjcmlwdG9yLm5h bWUpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3BhdXNlZC1z Y29wZXMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9wYXVzZWQtc2NvcGVz Lmh0bWwKaW5kZXggMmRkMTI0NWI1N2YuLmI2NzZmMThlNjdiIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvcGF1c2VkLXNjb3Blcy5odG1sCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9wYXVzZWQtc2NvcGVzLmh0bWwKQEAgLTM2LDcgKzM2LDcg QEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICAgICAgICAgIGZvciAobGV0IHNjb3BlT2JqZWN0IG9m IHNjb3BlLm9iamVjdHMpIHsKICAgICAgICAgICAgICAgICBwcm9taXNlcy5wdXNoKG5ldyBQcm9t aXNlKChyZXNvbHZlLCByZWplY3QpID0+IHsKLSAgICAgICAgICAgICAgICAgICAgc2NvcGVPYmpl Y3QuZ2V0QWxsUHJvcGVydHlEZXNjcmlwdG9ycygocHJvcGVydHlEZXNjcmlwdG9ycykgPT4gewor ICAgICAgICAgICAgICAgICAgICBzY29wZU9iamVjdC5nZXRQcm9wZXJ0eURlc2NyaXB0b3JzKChw cm9wZXJ0eURlc2NyaXB0b3JzKSA9PiB7CiAgICAgICAgICAgICAgICAgICAgICAgICBkYXRhLnBy b3BlcnRpZXMgPSBkYXRhLnByb3BlcnRpZXMuY29uY2F0KHByb3BlcnR5RGVzY3JpcHRvcnMpOwog ICAgICAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOwogICAgICAgICAgICAgICAgICAgICB9 KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci90YWlsLWRlbGV0 ZWQtZnJhbWVzLWZyb20tdm0tZW50cnkuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1 Z2dlci90YWlsLWRlbGV0ZWQtZnJhbWVzLWZyb20tdm0tZW50cnkuaHRtbAppbmRleCBhMGY0MTBj ZWUyMi4uZjg3YjhjMjg0YmEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1 Z2dlci90YWlsLWRlbGV0ZWQtZnJhbWVzLWZyb20tdm0tZW50cnkuaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvdGFpbC1kZWxldGVkLWZyYW1lcy1mcm9tLXZtLWVudHJ5 Lmh0bWwKQEAgLTYwLDcgKzYwLDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmV4cGVjdFRoYXQoY2FsbEZyYW1lLmlzVGFpbERlbGV0ZWQgPT09IGV4cGVjdGVk RnJhbWUuaXNUYWlsRGVsZXRlZCwgYFRhaWwgZGVsZXRlZCBleHBlY3RhdGlvbiBjb3JyZWN0OiAk e2NhbGxGcmFtZS5pc1RhaWxEZWxldGVkfWApOwogICAgICAgICAgICAgbGV0IHNjb3BlID0gY2Fs bEZyYW1lLnNjb3BlQ2hhaW5bMV07CiAKLSAgICAgICAgICAgIHNjb3BlLm9iamVjdHNbMF0uZ2V0 QWxsUHJvcGVydHlEZXNjcmlwdG9ycyhmdW5jdGlvbihwcm9wZXJ0aWVzKSB7CisgICAgICAgICAg ICBzY29wZS5vYmplY3RzWzBdLmdldFByb3BlcnR5RGVzY3JpcHRvcnMoZnVuY3Rpb24ocHJvcGVy dGllcykgewogICAgICAgICAgICAgICAgIGxldCBmb3VuZCA9IGZhbHNlOwogICAgICAgICAgICAg ICAgIGxldCB2YXJpYWJsZU5hbWUgPSBleHBlY3RlZEZyYW1lLnNjb3BlWzBdOwogICAgICAgICAg ICAgICAgIGxldCB2YXJpYWJsZVZhbHVlID0gZXhwZWN0ZWRGcmFtZS5zY29wZVsxXTsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci90YWlsLWRlbGV0ZWQtZnJhbWVz Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvdGFpbC1kZWxldGVkLWZyYW1l cy5odG1sCmluZGV4IDFkZTMxNjM2YmYzLi5kYWFhY2E5Nzk2NSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3RhaWwtZGVsZXRlZC1mcmFtZXMuaHRtbAorKysgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvdGFpbC1kZWxldGVkLWZyYW1lcy5odG1sCkBA IC02MSw3ICs2MSw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hc3NlcnQoY2FsbEZyYW1lLmlzVGFpbERlbGV0ZWQgPT09IGV4cGVjdGVkRnJhbWUuaXNUYWls RGVsZXRlZCk7CiAgICAgICAgICAgICBsZXQgdG9wU2NvcGUgPSBjYWxsRnJhbWUuc2NvcGVDaGFp blswXTsKIAotICAgICAgICAgICAgdG9wU2NvcGUub2JqZWN0c1swXS5nZXRBbGxQcm9wZXJ0eURl c2NyaXB0b3JzKGZ1bmN0aW9uKHByb3BlcnRpZXMpIHsKKyAgICAgICAgICAgIHRvcFNjb3BlLm9i amVjdHNbMF0uZ2V0UHJvcGVydHlEZXNjcmlwdG9ycyhmdW5jdGlvbihwcm9wZXJ0aWVzKSB7CiAg ICAgICAgICAgICAgICAgbGV0IGZvdW5kID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgbGV0IHZh cmlhYmxlTmFtZSA9IGV4cGVjdGVkRnJhbWUuc2NvcGVbMF07CiAgICAgICAgICAgICAgICAgbGV0 IHZhcmlhYmxlVmFsdWUgPSBleHBlY3RlZEZyYW1lLnNjb3BlWzFdOwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3RhaWwtcmVjdXJzaW9uLmh0bWwgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvdGFpbC1yZWN1cnNpb24uaHRtbAppbmRleCA0YTQxMzU2 ZTc0OC4uOGNiYWJhMWFkMmUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1 Z2dlci90YWlsLXJlY3Vyc2lvbi5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1 Z2dlci90YWlsLXJlY3Vyc2lvbi5odG1sCkBAIC02MSw3ICs2MSw3IEBAIGZ1bmN0aW9uIHRlc3Qo KQogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0 KCFjYWxsRnJhbWUuaXNUYWlsRGVsZXRlZCk7CiAKLSAgICAgICAgICAgIHRvcFNjb3BlLm9iamVj dHNbMF0uZ2V0QWxsUHJvcGVydHlEZXNjcmlwdG9ycyhmdW5jdGlvbihwcm9wZXJ0aWVzKSB7Cisg ICAgICAgICAgICB0b3BTY29wZS5vYmplY3RzWzBdLmdldFByb3BlcnR5RGVzY3JpcHRvcnMoZnVu Y3Rpb24ocHJvcGVydGllcykgewogICAgICAgICAgICAgICAgIGxldCBmb3VuZCA9IGZhbHNlOwog ICAgICAgICAgICAgICAgIGZvciAobGV0IHByb3BlcnR5RGVzY3JpcHRvciBvZiBwcm9wZXJ0aWVz KSB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChwcm9wZXJ0eURlc2NyaXB0b3IubmFtZSA9PT0g J2knKSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9i amVjdC1mYWtlLW9iamVjdC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90 ZS1vYmplY3QtZmFrZS1vYmplY3QuaHRtbAppbmRleCBjYjMwOTc0M2Q0OS4uYWM5ZmRlMTE4MWQg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0LWZh a2Utb2JqZWN0Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1v YmplY3QtZmFrZS1vYmplY3QuaHRtbApAQCAtMTIsOSArMTIsMTIgQEAgZnVuY3Rpb24gdGVzdCgp CiAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KGZha2VPYmplY3QudHlwZSA9PT0gIm9iamVj dCIgJiYgIWZha2VPYmplY3Quc3VidHlwZSwgIkEgZmFrZSByZW1vdGUgb2JqZWN0IHNob3VsZCBo YXZlIG9iamVjdCB0eXBlLiIpOwogICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChmYWtlT2Jq ZWN0ICE9PSBXSS5SZW1vdGVPYmplY3QuY3JlYXRlRmFrZVJlbW90ZU9iamVjdCgpLCAiRWFjaCBm YWtlIHJlbW90ZSBvYmplY3QgaW5zdGFuY2Ugc2hvdWxkIGJlIHVuaXF1ZS4iKTsKIAotICAgIGZh a2VPYmplY3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9ycyhmdW5jdGlvbihwcm9wZXJ0aWVzKSB7 CisgICAgY29uc3Qgb3B0aW9ucyA9IHsKKyAgICAgICAgb3duUHJvcGVydGllczogdHJ1ZSwKKyAg ICB9OworICAgIGZha2VPYmplY3QuZ2V0UHJvcGVydHlEZXNjcmlwdG9ycygocHJvcGVydGllcykg PT4gewogICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoQXJyYXkuaXNBcnJheShwcm9w ZXJ0aWVzKSAmJiAhcHJvcGVydGllcy5sZW5ndGgsICJBIGZha2UgcmVtb3RlIG9iamVjdCBzaG91 bGQgaGF2ZSBhbiBlbXB0eSBsaXN0IG9mIG93biBwcm9wZXJ0aWVzLiIpOwotICAgIH0pOworICAg IH0sIG9wdGlvbnMpOwogCiAgICAgZmFrZU9iamVjdC5nZXREaXNwbGF5YWJsZVByb3BlcnR5RGVz Y3JpcHRvcnMoZnVuY3Rpb24ocHJvcGVydGllcykgewogICAgICAgICBJbnNwZWN0b3JUZXN0LmV4 cGVjdFRoYXQoQXJyYXkuaXNBcnJheShwcm9wZXJ0aWVzKSAmJiAhcHJvcGVydGllcy5sZW5ndGgs ICJBIGZha2UgcmVtb3RlIG9iamVjdCBzaG91bGQgaGF2ZSBhbiBlbXB0eSBsaXN0IG9mIGRpc3Bs YXlhYmxlIHByb3BlcnRpZXMuIik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv bW9kZWwvcmVtb3RlLW9iamVjdC1nZXQtcHJvcGVydGllcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QtZ2V0LXByb3BlcnRpZXMuaHRtbAppbmRleCBiYjVi NzJlYjNhMC4uMWRiYjg0NGVkZGEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9t b2RlbC9yZW1vdGUtb2JqZWN0LWdldC1wcm9wZXJ0aWVzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QtZ2V0LXByb3BlcnRpZXMuaHRtbApAQCAtODUs MTMgKzg1LDE3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgaWYgKHJlbW90ZU9iamVj dC5zdWJ0eXBlKQogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJzdWJ0eXBlOiAi ICsgcmVtb3RlT2JqZWN0LnN1YnR5cGUpOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2co ImRlc2NyaXB0aW9uOiAiICsgcmVtb3RlT2JqZWN0LmRlc2NyaXB0aW9uKTsKLSAgICAgICAgICAg IHJlbW90ZU9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3JzKGZ1bmN0aW9uKHByb3BlcnRp ZXMpIHsKKworICAgICAgICAgICAgY29uc3Qgb3B0aW9ucyA9IHsKKyAgICAgICAgICAgICAgICBv d25Qcm9wZXJ0aWVzOiB0cnVlLAorICAgICAgICAgICAgfTsKKyAgICAgICAgICAgIHJlbW90ZU9i amVjdC5nZXRQcm9wZXJ0eURlc2NyaXB0b3JzKGZ1bmN0aW9uKHByb3BlcnRpZXMpIHsKICAgICAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiXG5PV04gUFJPUEVSVElFUzoiKTsKICAgICAg ICAgICAgICAgICBmb3IgKHZhciBwcm9wZXJ0eSBvZiBwcm9wZXJ0aWVzKSB7CiAgICAgICAgICAg ICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KHByb3BlcnR5IGluc3RhbmNlb2YgV0kuUHJv cGVydHlEZXNjcmlwdG9yKTsKICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2co IiAgICAiICsgcHJvcGVydHkubmFtZSk7CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAg fSk7CisgICAgICAgICAgICB9LCBvcHRpb25zKTsKIAogICAgICAgICAgICAgcmVtb3RlT2JqZWN0 LmdldERpc3BsYXlhYmxlUHJvcGVydHlEZXNjcmlwdG9ycyhmdW5jdGlvbihwcm9wZXJ0aWVzKSB7 CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIlxuRElTUExBWUFCTEUgUFJPUEVS VElFUzoiKTsKQEAgLTEwMSw3ICsxMDUsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9KTsKIAotICAgICAgICAgICAgcmVtb3RlT2JqZWN0LmdldEFs bFByb3BlcnR5RGVzY3JpcHRvcnMoZnVuY3Rpb24ocHJvcGVydGllcykgeworICAgICAgICAgICAg cmVtb3RlT2JqZWN0LmdldFByb3BlcnR5RGVzY3JpcHRvcnMoZnVuY3Rpb24ocHJvcGVydGllcykg ewogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJcbkFMTCBQUk9QRVJUSUVTOiIp OwogICAgICAgICAgICAgICAgIGZvciAodmFyIHByb3BlcnR5IG9mIHByb3BlcnRpZXMpIHsKICAg ICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQocHJvcGVydHkgaW5zdGFuY2Vv ZiBXSS5Qcm9wZXJ0eURlc2NyaXB0b3IpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXggZDJl ZTM1NzJmNGQuLjI4YmMwYzNkOWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyNSBAQAorMjAxOC0xMC0yNiAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisK KyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVmYWN0b3IgY29kZSBmb3IgZ2V0dGluZyBwcm9wZXJ0 aWVzIHZpYSBXSS5SZW1vdGVPYmplY3QKKyAgICAgICAgTmVlZCB0aGUgYnVnIFVSTCAoT09QUyEp LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9Qcm90b2NvbC9SZW1vdGVPYmplY3QuanM6CisgICAgICAgIChXSS5SZW1vdGVP YmplY3QucHJvdG90eXBlLmdldFByb3BlcnR5RGVzY3JpcHRvcnMpOiBBZGRlZC4KKyAgICAgICAg KFdJLlJlbW90ZU9iamVjdC5wcm90b3R5cGUuZ2V0UHJvcGVydHlEZXNjcmlwdG9yc0FzT2JqZWN0 KTogQWRkZWQuCisgICAgICAgIChXSS5SZW1vdGVPYmplY3QucHJvdG90eXBlLmdldE93blByb3Bl cnR5RGVzY3JpcHRvcnMpOiBEZWxldGVkLgorICAgICAgICAoV0kuUmVtb3RlT2JqZWN0LnByb3Rv dHlwZS5nZXRBbGxQcm9wZXJ0eURlc2NyaXB0b3JzKTogRGVsZXRlZC4KKyAgICAgICAgKFdJLlJl bW90ZU9iamVjdC5wcm90b3R5cGUuX2dldFByb3BlcnR5RGVzY3JpcHRvcnMpOiBEZWxldGVkLgor ICAgICAgICAoV0kuUmVtb3RlT2JqZWN0LnByb3RvdHlwZS5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0 b3JzQXNPYmplY3QpOiBEZWxldGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9F cnJvck9iamVjdFZpZXcuanM6CisgICAgICAgIChXSS5FcnJvck9iamVjdFZpZXcucHJvdG90eXBl LnVwZGF0ZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlUHJvcGVy dHlUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdJLk9iamVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVt ZW50LnByb3RvdHlwZS5fdXBkYXRlQ2hpbGRyZW4pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvT2JqZWN0VHJlZVZpZXcuanM6CisgICAgICAgIChXSS5PYmplY3RUcmVlVmlldy5wcm90 b3R5cGUudXBkYXRlKToKKwogMjAxOC0xMC0yNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBs ZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ2FudmFzIFJlY29yZGluZyBsb2FkaW5n IGdvZXMgc2lnbmlmaWNhbnRseSBzbG93ZXIgd2hlbiAiRnJhbWUiIHRyZWUgZWxlbWVudCBpcyBl eHBhbmRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv UHJvdG9jb2wvUmVtb3RlT2JqZWN0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvUHJvdG9jb2wvUmVtb3RlT2JqZWN0LmpzCmluZGV4IDYzNTY0NmVjNzBmLi4xYzhkYWM3 N2QwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJv dG9jb2wvUmVtb3RlT2JqZWN0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1Byb3RvY29sL1JlbW90ZU9iamVjdC5qcwpAQCAtMjYzLDE0ICsyNjMsMTQgQEAgV0ku UmVtb3RlT2JqZWN0ID0gY2xhc3MgUmVtb3RlT2JqZWN0CiAgICAgICAgIH0pOwogICAgIH0KIAot ICAgIGdldE93blByb3BlcnR5RGVzY3JpcHRvcnMoY2FsbGJhY2spCisgICAgZ2V0UHJvcGVydHlE ZXNjcmlwdG9ycyhjYWxsYmFjaywgb3B0aW9ucyA9IHt9KQogICAgIHsKLSAgICAgICAgdGhpcy5f Z2V0UHJvcGVydHlEZXNjcmlwdG9ycyh0cnVlLCBjYWxsYmFjayk7Ci0gICAgfQorICAgICAgICBp ZiAoIXRoaXMuX29iamVjdElkIHx8IHRoaXMuX2lzU3ltYm9sKCkgfHwgdGhpcy5faXNGYWtlT2Jq ZWN0KCkpIHsKKyAgICAgICAgICAgIGNhbGxiYWNrKFtdKTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQogCi0gICAgZ2V0QWxsUHJvcGVydHlEZXNjcmlwdG9ycyhjYWxsYmFjaykKLSAg ICB7Ci0gICAgICAgIHRoaXMuX2dldFByb3BlcnR5RGVzY3JpcHRvcnMoZmFsc2UsIGNhbGxiYWNr KTsKKyAgICAgICAgdGhpcy5fdGFyZ2V0LlJ1bnRpbWVBZ2VudC5nZXRQcm9wZXJ0aWVzKHRoaXMu X29iamVjdElkLCBvcHRpb25zLm93blByb3BlcnRpZXMsIG9wdGlvbnMuZ2VuZXJhdGVQcmV2aWV3 LCB0aGlzLl9nZXRQcm9wZXJ0eURlc2NyaXB0b3JzUmVzb2x2ZXIuYmluZCh0aGlzLCBjYWxsYmFj aykpOwogICAgIH0KIAogICAgIGdldERpc3BsYXlhYmxlUHJvcGVydHlEZXNjcmlwdG9ycyhjYWxs YmFjaykKQEAgLTY1MSwxOSArNjUxLDkgQEAgV0kuUmVtb3RlT2JqZWN0ID0gY2xhc3MgUmVtb3Rl T2JqZWN0CiAgICAgICAgIHJldHVybiBKU09OLnN0cmluZ2lmeSh0aGlzLl9vYmplY3RJZCkgKyAi LSIgKyB0aGlzLl9zdWJ0eXBlOwogICAgIH0KIAotICAgIF9nZXRQcm9wZXJ0eURlc2NyaXB0b3Jz KG93blByb3BlcnRpZXMsIGNhbGxiYWNrKQorICAgIGdldFByb3BlcnR5RGVzY3JpcHRvcnNBc09i amVjdChjYWxsYmFjaywgb3B0aW9ucyA9IHt9KQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9v YmplY3RJZCB8fCB0aGlzLl9pc1N5bWJvbCgpIHx8IHRoaXMuX2lzRmFrZU9iamVjdCgpKSB7Ci0g ICAgICAgICAgICBjYWxsYmFjayhbXSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0K LQotICAgICAgICB0aGlzLl90YXJnZXQuUnVudGltZUFnZW50LmdldFByb3BlcnRpZXModGhpcy5f b2JqZWN0SWQsIG93blByb3BlcnRpZXMsIHRydWUsIHRoaXMuX2dldFByb3BlcnR5RGVzY3JpcHRv cnNSZXNvbHZlci5iaW5kKHRoaXMsIGNhbGxiYWNrKSk7Ci0gICAgfQotCi0gICAgZ2V0T3duUHJv cGVydHlEZXNjcmlwdG9yc0FzT2JqZWN0KGNhbGxiYWNrKQotICAgIHsKLSAgICAgICAgdGhpcy5n ZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3JzKGZ1bmN0aW9uKHByb3BlcnRpZXMpIHsKKyAgICAgICAg dGhpcy5nZXRQcm9wZXJ0eURlc2NyaXB0b3JzKGZ1bmN0aW9uKHByb3BlcnRpZXMpIHsKICAgICAg ICAgICAgIHZhciBwcm9wZXJ0aWVzUmVzdWx0ID0ge307CiAgICAgICAgICAgICB2YXIgaW50ZXJu YWxQcm9wZXJ0aWVzUmVzdWx0ID0ge307CiAgICAgICAgICAgICBmb3IgKHZhciBwcm9wZXJ0eURl c2NyaXB0b3Igb2YgcHJvcGVydGllcykgewpAQCAtNjcxLDcgKzY2MSw3IEBAIFdJLlJlbW90ZU9i amVjdCA9IGNsYXNzIFJlbW90ZU9iamVjdAogICAgICAgICAgICAgICAgIG9iamVjdFtwcm9wZXJ0 eURlc2NyaXB0b3IubmFtZV0gPSBwcm9wZXJ0eURlc2NyaXB0b3I7CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBjYWxsYmFjayhwcm9wZXJ0aWVzUmVzdWx0LCBpbnRlcm5hbFByb3BlcnRpZXNS ZXN1bHQpOwotICAgICAgICB9KTsKKyAgICAgICAgfSwgb3B0aW9ucyk7CiAgICAgfQogCiAgICAg X2dldFByb3BlcnR5RGVzY3JpcHRvcnNSZXNvbHZlcihjYWxsYmFjaywgZXJyb3IsIHByb3BlcnRp ZXMsIGludGVybmFsUHJvcGVydGllcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Vycm9yT2JqZWN0Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Vycm9yT2JqZWN0Vmlldy5qcwppbmRleCBmNmQw ZTc1NjcxNS4uMGFjYTFmNGQyNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0Vycm9yT2JqZWN0Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FcnJvck9iamVjdFZpZXcuanMKQEAgLTkyLDE0 ICs5MiwxOCBAQCBXSS5FcnJvck9iamVjdFZpZXcgPSBjbGFzcyBFcnJvck9iamVjdFZpZXcgZXh0 ZW5kcyBXSS5PYmplY3QKIAogICAgIHVwZGF0ZSgpCiAgICAgewotICAgICAgICB0aGlzLl9vYmpl Y3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yc0FzT2JqZWN0KChwcm9wZXJ0aWVzKSA9PiB7Cisg ICAgICAgIGNvbnN0IG9wdGlvbnMgPSB7CisgICAgICAgICAgICBvd25Qcm9wZXJ0aWVzOiB0cnVl LAorICAgICAgICAgICAgZ2VuZXJhdGVQcmV2aWV3OiB0cnVlLAorICAgICAgICB9OworICAgICAg ICB0aGlzLl9vYmplY3QuZ2V0UHJvcGVydHlEZXNjcmlwdG9yc0FzT2JqZWN0KChwcm9wZXJ0aWVz KSA9PiB7CiAgICAgICAgICAgICBjb25zb2xlLmFzc2VydChwcm9wZXJ0aWVzICYmIHByb3BlcnRp ZXMuc3RhY2sgJiYgcHJvcGVydGllcy5zdGFjay52YWx1ZSk7CiAKICAgICAgICAgICAgIGlmICgh dGhpcy5faGFzU3RhY2tUcmFjZSkKICAgICAgICAgICAgICAgICB0aGlzLl9idWlsZFN0YWNrVHJh Y2UocHJvcGVydGllcy5zdGFjay52YWx1ZS52YWx1ZSk7CiAKICAgICAgICAgICAgIHRoaXMuX2hh c1N0YWNrVHJhY2UgPSB0cnVlOwotICAgICAgICB9KTsKKyAgICAgICAgfSwgb3B0aW9ucyk7CiAg ICAgfQogCiAgICAgZXhwYW5kKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVByb3BlcnR5 VHJlZUVsZW1lbnQuanMKaW5kZXggNjM0ZTVlMjk2YzYuLjg1ZDY1NTZhNTdlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlUHJv cGVydHlUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9PYmplY3RUcmVlUHJvcGVydHlUcmVlRWxlbWVudC5qcwpAQCAtMzIxLDEzICsz MjEsMTggQEAgV0kuT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQgPSBjbGFzcyBPYmplY3RU cmVlUHJvcGVydHlUcmVlRWxlbWVudCBleHRlbmRzIFcKICAgICAgICAgaWYgKHRoaXMuY2hpbGRy ZW4ubGVuZ3RoICYmICF0aGlzLnNob3VsZFJlZnJlc2hDaGlsZHJlbikKICAgICAgICAgICAgIHJl dHVybjsKIAorICAgICAgICBjb25zdCBvcHRpb25zID0geworICAgICAgICAgICAgb3duUHJvcGVy dGllczogdHJ1ZSwKKyAgICAgICAgICAgIGdlbmVyYXRlUHJldmlldzogdHJ1ZSwKKyAgICAgICAg fTsKKwogICAgICAgICB2YXIgcmVzb2x2ZWRWYWx1ZSA9IHRoaXMucmVzb2x2ZWRWYWx1ZSgpOwog ICAgICAgICBpZiAocmVzb2x2ZWRWYWx1ZS5pc0NvbGxlY3Rpb25UeXBlKCkgJiYgdGhpcy5fbW9k ZSA9PT0gV0kuT2JqZWN0VHJlZVZpZXcuTW9kZS5Qcm9wZXJ0aWVzKQogICAgICAgICAgICAgcmVz b2x2ZWRWYWx1ZS5nZXRDb2xsZWN0aW9uRW50cmllcygwLCAxMDAsIHRoaXMuX3VwZGF0ZUNoaWxk cmVuSW50ZXJuYWwuYmluZCh0aGlzLCB0aGlzLl91cGRhdGVFbnRyaWVzLCB0aGlzLl9tb2RlKSk7 CiAgICAgICAgIGVsc2UgaWYgKHRoaXMuX21vZGUgPT09IFdJLk9iamVjdFRyZWVWaWV3Lk1vZGUu Q2xhc3NBUEkgfHwgdGhpcy5fbW9kZSA9PT0gV0kuT2JqZWN0VHJlZVZpZXcuTW9kZS5QdXJlQVBJ KQotICAgICAgICAgICAgcmVzb2x2ZWRWYWx1ZS5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3JzKHRo aXMuX3VwZGF0ZUNoaWxkcmVuSW50ZXJuYWwuYmluZCh0aGlzLCB0aGlzLl91cGRhdGVQcm9wZXJ0 aWVzLCBXSS5PYmplY3RUcmVlVmlldy5Nb2RlLkNsYXNzQVBJKSk7CisgICAgICAgICAgICByZXNv bHZlZFZhbHVlLmdldFByb3BlcnR5RGVzY3JpcHRvcnModGhpcy5fdXBkYXRlQ2hpbGRyZW5JbnRl cm5hbC5iaW5kKHRoaXMsIHRoaXMuX3VwZGF0ZVByb3BlcnRpZXMsIFdJLk9iamVjdFRyZWVWaWV3 Lk1vZGUuQ2xhc3NBUEkpLCBvcHRpb25zKTsKICAgICAgICAgZWxzZSBpZiAodGhpcy5wcm9wZXJ0 eS5uYW1lID09PSAiX19wcm90b19fIikKLSAgICAgICAgICAgIHJlc29sdmVkVmFsdWUuZ2V0T3du UHJvcGVydHlEZXNjcmlwdG9ycyh0aGlzLl91cGRhdGVDaGlsZHJlbkludGVybmFsLmJpbmQodGhp cywgdGhpcy5fdXBkYXRlUHJvcGVydGllcywgV0kuT2JqZWN0VHJlZVZpZXcuTW9kZS5Qcm90b3R5 cGVBUEkpKTsKKyAgICAgICAgICAgIHJlc29sdmVkVmFsdWUuZ2V0UHJvcGVydHlEZXNjcmlwdG9y cyh0aGlzLl91cGRhdGVDaGlsZHJlbkludGVybmFsLmJpbmQodGhpcywgdGhpcy5fdXBkYXRlUHJv cGVydGllcywgV0kuT2JqZWN0VHJlZVZpZXcuTW9kZS5Qcm90b3R5cGVBUEkpLCBvcHRpb25zKTsK ICAgICAgICAgZWxzZQogICAgICAgICAgICAgcmVzb2x2ZWRWYWx1ZS5nZXREaXNwbGF5YWJsZVBy b3BlcnR5RGVzY3JpcHRvcnModGhpcy5fdXBkYXRlQ2hpbGRyZW5JbnRlcm5hbC5iaW5kKHRoaXMs IHRoaXMuX3VwZGF0ZVByb3BlcnRpZXMsIHRoaXMuX21vZGUpKTsKICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlVmll dy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRy ZWVWaWV3LmpzCmluZGV4IGEwYmU4ZGI5YmNlLi41NTc0M2FhNGNmNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJl ZVZpZXcuanMKQEAgLTI0NiwxMiArMjQ2LDE3IEBAIFdJLk9iamVjdFRyZWVWaWV3ID0gY2xhc3Mg T2JqZWN0VHJlZVZpZXcgZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgIHVwZGF0ZSgpCiAgICAgewor ICAgICAgICBjb25zdCBvcHRpb25zID0geworICAgICAgICAgICAgb3duUHJvcGVydGllczogdHJ1 ZSwKKyAgICAgICAgICAgIGdlbmVyYXRlUHJldmlldzogdHJ1ZSwKKyAgICAgICAgfTsKKwogICAg ICAgICBpZiAodGhpcy5fb2JqZWN0LmlzQ29sbGVjdGlvblR5cGUoKSAmJiB0aGlzLl9tb2RlID09 PSBXSS5PYmplY3RUcmVlVmlldy5Nb2RlLlByb3BlcnRpZXMpCiAgICAgICAgICAgICB0aGlzLl9v YmplY3QuZ2V0Q29sbGVjdGlvbkVudHJpZXMoMCwgMTAwLCB0aGlzLl91cGRhdGVDaGlsZHJlbi5i aW5kKHRoaXMsIHRoaXMuX3VwZGF0ZUVudHJpZXMpKTsKICAgICAgICAgZWxzZSBpZiAodGhpcy5f b2JqZWN0LmlzQ2xhc3MoKSkKICAgICAgICAgICAgIHRoaXMuX29iamVjdC5jbGFzc1Byb3RvdHlw ZS5nZXREaXNwbGF5YWJsZVByb3BlcnR5RGVzY3JpcHRvcnModGhpcy5fdXBkYXRlQ2hpbGRyZW4u YmluZCh0aGlzLCB0aGlzLl91cGRhdGVQcm9wZXJ0aWVzKSk7CiAgICAgICAgIGVsc2UgaWYgKHRo aXMuX21vZGUgPT09IFdJLk9iamVjdFRyZWVWaWV3Lk1vZGUuUHVyZUFQSSkKLSAgICAgICAgICAg IHRoaXMuX29iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3JzKHRoaXMuX3VwZGF0ZUNoaWxk cmVuLmJpbmQodGhpcywgdGhpcy5fdXBkYXRlUHJvcGVydGllcykpOworICAgICAgICAgICAgdGhp cy5fb2JqZWN0LmdldFByb3BlcnR5RGVzY3JpcHRvcnModGhpcy5fdXBkYXRlQ2hpbGRyZW4uYmlu ZCh0aGlzLCB0aGlzLl91cGRhdGVQcm9wZXJ0aWVzKSwgb3B0aW9ucyk7CiAgICAgICAgIGVsc2UK ICAgICAgICAgICAgIHRoaXMuX29iamVjdC5nZXREaXNwbGF5YWJsZVByb3BlcnR5RGVzY3JpcHRv cnModGhpcy5fdXBkYXRlQ2hpbGRyZW4uYmluZCh0aGlzLCB0aGlzLl91cGRhdGVQcm9wZXJ0aWVz KSk7CiAgICAgfQo= 353243 2018-10-27 11:11:41 -0700 2018-10-29 16:29:21 -0700 Patch remoteObject.diff text/plain 16868 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkOWY1YzVhYjA4MC4uZWVkMzZlN2E3YzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAor MjAxOC0xMC0yNyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAg V2ViIEluc3BlY3RvcjogcmVmYWN0b3IgY29kZSBmb3IgZ2V0dGluZyBwcm9wZXJ0aWVzIHZpYSBX SS5SZW1vdGVPYmplY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5MDk4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1 ZXN0LWludGVybmFsLXByb3BlcnRpZXMuaHR0cHMuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZGVidWdnZXIvYnJlYWtwb2ludC1zY29wZS5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1 Z2dlci9wYXVzZWQtc2NvcGVzLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3Rh aWwtZGVsZXRlZC1mcmFtZXMtZnJvbS12bS1lbnRyeS5odG1sOgorICAgICAgICAqIGluc3BlY3Rv ci9kZWJ1Z2dlci90YWlsLWRlbGV0ZWQtZnJhbWVzLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9y L2RlYnVnZ2VyL3RhaWwtcmVjdXJzaW9uLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL21vZGVs L3JlbW90ZS1vYmplY3QtZmFrZS1vYmplY3QuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvbW9k ZWwvcmVtb3RlLW9iamVjdC1nZXQtcHJvcGVydGllcy5odG1sOgorCiAyMDE4LTEwLTI2ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBBbmltYXRpb25z XSBSZW1vdmUgdXNlbGVzcyBpbnRlcm5hbHMgbWV0aG9kcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGF5bWVudHJlcXVlc3QvcGF5bWVudC1yZXF1ZXN0LWlu dGVybmFsLXByb3BlcnRpZXMuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5z cGVjdG9yL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1pbnRlcm5hbC1wcm9wZXJ0aWVz Lmh0dHBzLmh0bWwKaW5kZXggYjcwNTk3MTdmOTUuLjYxNjg5OTk2OGE0IDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9wYXltZW50cmVxdWVzdC9wYXltZW50LXJl cXVlc3QtaW50ZXJuYWwtcHJvcGVydGllcy5odHRwcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvaW5zcGVjdG9yL3BheW1lbnRyZXF1ZXN0L3BheW1lbnQtcmVxdWVzdC1pbnRlcm5h bC1wcm9wZXJ0aWVzLmh0dHBzLmh0bWwKQEAgLTEzNSw3ICsxMzUsNyBAQCBmdW5jdGlvbiB0ZXN0 KCkKICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZShleHBy ZXNzaW9uLCBudWxsLCB7cmVtb3RlT2JqZWN0T25seTogdHJ1ZX0pLAogICAgICAgICAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmF3YWl0RXZlbnQoIkNvbnRpbnVlIiksCiAgICAgICAgICAgICAg ICAgXSk7Ci0gICAgICAgICAgICAgICAgbGV0IFtwcm9wZXJ0eURlc2NyaXB0b3JzXSA9IGF3YWl0 IHByb21pc2lmeSgoY2IpID0+IHsgcmVtb3RlT2JqZWN0LmdldEFsbFByb3BlcnR5RGVzY3JpcHRv cnMoY2IpOyB9KTsKKyAgICAgICAgICAgICAgICBsZXQgW3Byb3BlcnR5RGVzY3JpcHRvcnNdID0g YXdhaXQgcHJvbWlzaWZ5KChjYikgPT4geyByZW1vdGVPYmplY3QuZ2V0UHJvcGVydHlEZXNjcmlw dG9ycyhjYik7IH0pOwogICAgICAgICAgICAgICAgIGZvciAobGV0IHByb3BlcnR5RGVzY3JpcHRv ciBvZiBwcm9wZXJ0eURlc2NyaXB0b3JzLnJldmVyc2UoKSkgewogICAgICAgICAgICAgICAgICAg ICBpZiAocHJvcGVydHlEZXNjcmlwdG9yLmlzSW50ZXJuYWxQcm9wZXJ0eSkgewogICAgICAgICAg ICAgICAgICAgICAgICAgbGV0IGRpc3BsYXlTdHJpbmcgPSBhd2FpdCBwcm9wZXJ0eURlc2NyaXB0 b3JTdHJpbmcocHJvcGVydHlEZXNjcmlwdG9yKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9kZWJ1Z2dlci9icmVha3BvaW50LXNjb3BlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvYnJlYWtwb2ludC1zY29wZS5odG1sCmluZGV4IGM2NDZmNzA3ZWNiLi4y NDExNDQ2MDhkOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2Jy ZWFrcG9pbnQtc2NvcGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIv YnJlYWtwb2ludC1zY29wZS5odG1sCkBAIC01Nyw3ICs1Nyw3IEBAIGZ1bmN0aW9uIHRlc3QoKQog ICAgICAgICBmb3IgKHZhciBzY29wZSBvZiBzY29wZUNoYWluKSB7CiAgICAgICAgICAgICBzY29w ZVR5cGVzLnB1c2goc2NvcGUudHlwZSk7CiAgICAgICAgICAgICBpZiAoc2NvcGUudHlwZSAhPT0g V0kuU2NvcGVDaGFpbk5vZGUuVHlwZS5HbG9iYWwpIHsKLSAgICAgICAgICAgICAgICBzY29wZS5v YmplY3RzWzBdLmdldEFsbFByb3BlcnR5RGVzY3JpcHRvcnMoZnVuY3Rpb24ocHJvcGVydGllcykg eworICAgICAgICAgICAgICAgIHNjb3BlLm9iamVjdHNbMF0uZ2V0UHJvcGVydHlEZXNjcmlwdG9y cyhmdW5jdGlvbihwcm9wZXJ0aWVzKSB7CiAgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRl c3QubG9nKHNjb3BlVHlwZXNbc2NvcGVUeXBlSW5kZXgrK10gKyAiIHByb3BlcnRpZXM6Iik7CiAg ICAgICAgICAgICAgICAgICAgIGZvciAodmFyIHByb3BlcnR5RGVzY3JpcHRvciBvZiBwcm9wZXJ0 aWVzKQogICAgICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIiAgICAiICsg cHJvcGVydHlEZXNjcmlwdG9yLm5hbWUpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyL3BhdXNlZC1zY29wZXMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci9wYXVzZWQtc2NvcGVzLmh0bWwKaW5kZXggMmRkMTI0NWI1N2YuLmI2NzZmMThlNjdi IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvcGF1c2VkLXNjb3Bl cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9wYXVzZWQtc2NvcGVz Lmh0bWwKQEAgLTM2LDcgKzM2LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICAgICAgICAgIGZv ciAobGV0IHNjb3BlT2JqZWN0IG9mIHNjb3BlLm9iamVjdHMpIHsKICAgICAgICAgICAgICAgICBw cm9taXNlcy5wdXNoKG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHsKLSAgICAgICAg ICAgICAgICAgICAgc2NvcGVPYmplY3QuZ2V0QWxsUHJvcGVydHlEZXNjcmlwdG9ycygocHJvcGVy dHlEZXNjcmlwdG9ycykgPT4geworICAgICAgICAgICAgICAgICAgICBzY29wZU9iamVjdC5nZXRQ cm9wZXJ0eURlc2NyaXB0b3JzKChwcm9wZXJ0eURlc2NyaXB0b3JzKSA9PiB7CiAgICAgICAgICAg ICAgICAgICAgICAgICBkYXRhLnByb3BlcnRpZXMgPSBkYXRhLnByb3BlcnRpZXMuY29uY2F0KHBy b3BlcnR5RGVzY3JpcHRvcnMpOwogICAgICAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOwog ICAgICAgICAgICAgICAgICAgICB9KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9kZWJ1Z2dlci90YWlsLWRlbGV0ZWQtZnJhbWVzLWZyb20tdm0tZW50cnkuaHRtbCBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci90YWlsLWRlbGV0ZWQtZnJhbWVzLWZyb20tdm0tZW50 cnkuaHRtbAppbmRleCBhMGY0MTBjZWUyMi4uZjg3YjhjMjg0YmEgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci90YWlsLWRlbGV0ZWQtZnJhbWVzLWZyb20tdm0tZW50 cnkuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvdGFpbC1kZWxldGVk LWZyYW1lcy1mcm9tLXZtLWVudHJ5Lmh0bWwKQEAgLTYwLDcgKzYwLDcgQEAgZnVuY3Rpb24gdGVz dCgpCiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoY2FsbEZyYW1lLmlzVGFp bERlbGV0ZWQgPT09IGV4cGVjdGVkRnJhbWUuaXNUYWlsRGVsZXRlZCwgYFRhaWwgZGVsZXRlZCBl eHBlY3RhdGlvbiBjb3JyZWN0OiAke2NhbGxGcmFtZS5pc1RhaWxEZWxldGVkfWApOwogICAgICAg ICAgICAgbGV0IHNjb3BlID0gY2FsbEZyYW1lLnNjb3BlQ2hhaW5bMV07CiAKLSAgICAgICAgICAg IHNjb3BlLm9iamVjdHNbMF0uZ2V0QWxsUHJvcGVydHlEZXNjcmlwdG9ycyhmdW5jdGlvbihwcm9w ZXJ0aWVzKSB7CisgICAgICAgICAgICBzY29wZS5vYmplY3RzWzBdLmdldFByb3BlcnR5RGVzY3Jp cHRvcnMoZnVuY3Rpb24ocHJvcGVydGllcykgewogICAgICAgICAgICAgICAgIGxldCBmb3VuZCA9 IGZhbHNlOwogICAgICAgICAgICAgICAgIGxldCB2YXJpYWJsZU5hbWUgPSBleHBlY3RlZEZyYW1l LnNjb3BlWzBdOwogICAgICAgICAgICAgICAgIGxldCB2YXJpYWJsZVZhbHVlID0gZXhwZWN0ZWRG cmFtZS5zY29wZVsxXTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci90YWlsLWRlbGV0ZWQtZnJhbWVzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdn ZXIvdGFpbC1kZWxldGVkLWZyYW1lcy5odG1sCmluZGV4IDFkZTMxNjM2YmYzLi5kYWFhY2E5Nzk2 NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3RhaWwtZGVsZXRl ZC1mcmFtZXMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvdGFpbC1k ZWxldGVkLWZyYW1lcy5odG1sCkBAIC02MSw3ICs2MSw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoY2FsbEZyYW1lLmlzVGFpbERlbGV0ZWQgPT09 IGV4cGVjdGVkRnJhbWUuaXNUYWlsRGVsZXRlZCk7CiAgICAgICAgICAgICBsZXQgdG9wU2NvcGUg PSBjYWxsRnJhbWUuc2NvcGVDaGFpblswXTsKIAotICAgICAgICAgICAgdG9wU2NvcGUub2JqZWN0 c1swXS5nZXRBbGxQcm9wZXJ0eURlc2NyaXB0b3JzKGZ1bmN0aW9uKHByb3BlcnRpZXMpIHsKKyAg ICAgICAgICAgIHRvcFNjb3BlLm9iamVjdHNbMF0uZ2V0UHJvcGVydHlEZXNjcmlwdG9ycyhmdW5j dGlvbihwcm9wZXJ0aWVzKSB7CiAgICAgICAgICAgICAgICAgbGV0IGZvdW5kID0gZmFsc2U7CiAg ICAgICAgICAgICAgICAgbGV0IHZhcmlhYmxlTmFtZSA9IGV4cGVjdGVkRnJhbWUuc2NvcGVbMF07 CiAgICAgICAgICAgICAgICAgbGV0IHZhcmlhYmxlVmFsdWUgPSBleHBlY3RlZEZyYW1lLnNjb3Bl WzFdOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3RhaWwtcmVj dXJzaW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvdGFpbC1yZWN1cnNp b24uaHRtbAppbmRleCA0YTQxMzU2ZTc0OC4uOGNiYWJhMWFkMmUgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci90YWlsLXJlY3Vyc2lvbi5odG1sCisrKyBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci90YWlsLXJlY3Vyc2lvbi5odG1sCkBAIC02MSw3ICs2 MSw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAg IEluc3BlY3RvclRlc3QuYXNzZXJ0KCFjYWxsRnJhbWUuaXNUYWlsRGVsZXRlZCk7CiAKLSAgICAg ICAgICAgIHRvcFNjb3BlLm9iamVjdHNbMF0uZ2V0QWxsUHJvcGVydHlEZXNjcmlwdG9ycyhmdW5j dGlvbihwcm9wZXJ0aWVzKSB7CisgICAgICAgICAgICB0b3BTY29wZS5vYmplY3RzWzBdLmdldFBy b3BlcnR5RGVzY3JpcHRvcnMoZnVuY3Rpb24ocHJvcGVydGllcykgewogICAgICAgICAgICAgICAg IGxldCBmb3VuZCA9IGZhbHNlOwogICAgICAgICAgICAgICAgIGZvciAobGV0IHByb3BlcnR5RGVz Y3JpcHRvciBvZiBwcm9wZXJ0aWVzKSB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChwcm9wZXJ0 eURlc2NyaXB0b3IubmFtZSA9PT0gJ2knKSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC1mYWtlLW9iamVjdC5odG1sIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QtZmFrZS1vYmplY3QuaHRtbAppbmRleCBjYjMw OTc0M2Q0OS4uYWM5ZmRlMTE4MWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9t b2RlbC9yZW1vdGUtb2JqZWN0LWZha2Utb2JqZWN0Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QtZmFrZS1vYmplY3QuaHRtbApAQCAtMTIsOSArMTIs MTIgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KGZha2VP YmplY3QudHlwZSA9PT0gIm9iamVjdCIgJiYgIWZha2VPYmplY3Quc3VidHlwZSwgIkEgZmFrZSBy ZW1vdGUgb2JqZWN0IHNob3VsZCBoYXZlIG9iamVjdCB0eXBlLiIpOwogICAgIEluc3BlY3RvclRl c3QuZXhwZWN0VGhhdChmYWtlT2JqZWN0ICE9PSBXSS5SZW1vdGVPYmplY3QuY3JlYXRlRmFrZVJl bW90ZU9iamVjdCgpLCAiRWFjaCBmYWtlIHJlbW90ZSBvYmplY3QgaW5zdGFuY2Ugc2hvdWxkIGJl IHVuaXF1ZS4iKTsKIAotICAgIGZha2VPYmplY3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9ycyhm dW5jdGlvbihwcm9wZXJ0aWVzKSB7CisgICAgY29uc3Qgb3B0aW9ucyA9IHsKKyAgICAgICAgb3du UHJvcGVydGllczogdHJ1ZSwKKyAgICB9OworICAgIGZha2VPYmplY3QuZ2V0UHJvcGVydHlEZXNj cmlwdG9ycygocHJvcGVydGllcykgPT4gewogICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRo YXQoQXJyYXkuaXNBcnJheShwcm9wZXJ0aWVzKSAmJiAhcHJvcGVydGllcy5sZW5ndGgsICJBIGZh a2UgcmVtb3RlIG9iamVjdCBzaG91bGQgaGF2ZSBhbiBlbXB0eSBsaXN0IG9mIG93biBwcm9wZXJ0 aWVzLiIpOwotICAgIH0pOworICAgIH0sIG9wdGlvbnMpOwogCiAgICAgZmFrZU9iamVjdC5nZXRE aXNwbGF5YWJsZVByb3BlcnR5RGVzY3JpcHRvcnMoZnVuY3Rpb24ocHJvcGVydGllcykgewogICAg ICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoQXJyYXkuaXNBcnJheShwcm9wZXJ0aWVzKSAm JiAhcHJvcGVydGllcy5sZW5ndGgsICJBIGZha2UgcmVtb3RlIG9iamVjdCBzaG91bGQgaGF2ZSBh biBlbXB0eSBsaXN0IG9mIGRpc3BsYXlhYmxlIHByb3BlcnRpZXMuIik7CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC1nZXQtcHJvcGVydGllcy5o dG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QtZ2V0LXByb3Bl cnRpZXMuaHRtbAppbmRleCBiYjViNzJlYjNhMC4uMWRiYjg0NGVkZGEgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0LWdldC1wcm9wZXJ0aWVzLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QtZ2V0LXBy b3BlcnRpZXMuaHRtbApAQCAtODUsMTMgKzg1LDE3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAg ICAgICAgaWYgKHJlbW90ZU9iamVjdC5zdWJ0eXBlKQogICAgICAgICAgICAgICAgIEluc3BlY3Rv clRlc3QubG9nKCJzdWJ0eXBlOiAiICsgcmVtb3RlT2JqZWN0LnN1YnR5cGUpOwogICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5sb2coImRlc2NyaXB0aW9uOiAiICsgcmVtb3RlT2JqZWN0LmRlc2Ny aXB0aW9uKTsKLSAgICAgICAgICAgIHJlbW90ZU9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0 b3JzKGZ1bmN0aW9uKHByb3BlcnRpZXMpIHsKKworICAgICAgICAgICAgY29uc3Qgb3B0aW9ucyA9 IHsKKyAgICAgICAgICAgICAgICBvd25Qcm9wZXJ0aWVzOiB0cnVlLAorICAgICAgICAgICAgfTsK KyAgICAgICAgICAgIHJlbW90ZU9iamVjdC5nZXRQcm9wZXJ0eURlc2NyaXB0b3JzKGZ1bmN0aW9u KHByb3BlcnRpZXMpIHsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiXG5PV04g UFJPUEVSVElFUzoiKTsKICAgICAgICAgICAgICAgICBmb3IgKHZhciBwcm9wZXJ0eSBvZiBwcm9w ZXJ0aWVzKSB7CiAgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KHByb3Bl cnR5IGluc3RhbmNlb2YgV0kuUHJvcGVydHlEZXNjcmlwdG9yKTsKICAgICAgICAgICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5sb2coIiAgICAiICsgcHJvcGVydHkubmFtZSk7CiAgICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9LCBvcHRpb25zKTsKIAogICAg ICAgICAgICAgcmVtb3RlT2JqZWN0LmdldERpc3BsYXlhYmxlUHJvcGVydHlEZXNjcmlwdG9ycyhm dW5jdGlvbihwcm9wZXJ0aWVzKSB7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2co IlxuRElTUExBWUFCTEUgUFJPUEVSVElFUzoiKTsKQEAgLTEwMSw3ICsxMDUsNyBAQCBmdW5jdGlv biB0ZXN0KCkKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9KTsKIAotICAgICAgICAg ICAgcmVtb3RlT2JqZWN0LmdldEFsbFByb3BlcnR5RGVzY3JpcHRvcnMoZnVuY3Rpb24ocHJvcGVy dGllcykgeworICAgICAgICAgICAgcmVtb3RlT2JqZWN0LmdldFByb3BlcnR5RGVzY3JpcHRvcnMo ZnVuY3Rpb24ocHJvcGVydGllcykgewogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9n KCJcbkFMTCBQUk9QRVJUSUVTOiIpOwogICAgICAgICAgICAgICAgIGZvciAodmFyIHByb3BlcnR5 IG9mIHByb3BlcnRpZXMpIHsKICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3Nl cnQocHJvcGVydHkgaW5zdGFuY2VvZiBXSS5Qcm9wZXJ0eURlc2NyaXB0b3IpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9DaGFuZ2VMb2cKaW5kZXggZDJlZTM1NzJmNGQuLjI4YmMwYzNkOWM2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxOC0xMC0yNyAgRGV2aW4gUm91c3NvICA8 ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVmYWN0b3IgY29k ZSBmb3IgZ2V0dGluZyBwcm9wZXJ0aWVzIHZpYSBXSS5SZW1vdGVPYmplY3QKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDk4OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Qcm90 b2NvbC9SZW1vdGVPYmplY3QuanM6CisgICAgICAgIChXSS5SZW1vdGVPYmplY3QucHJvdG90eXBl LmdldFByb3BlcnR5RGVzY3JpcHRvcnMpOiBBZGRlZC4KKyAgICAgICAgKFdJLlJlbW90ZU9iamVj dC5wcm90b3R5cGUuZ2V0UHJvcGVydHlEZXNjcmlwdG9yc0FzT2JqZWN0KTogQWRkZWQuCisgICAg ICAgIChXSS5SZW1vdGVPYmplY3QucHJvdG90eXBlLmdldE93blByb3BlcnR5RGVzY3JpcHRvcnMp OiBEZWxldGVkLgorICAgICAgICAoV0kuUmVtb3RlT2JqZWN0LnByb3RvdHlwZS5nZXRBbGxQcm9w ZXJ0eURlc2NyaXB0b3JzKTogRGVsZXRlZC4KKyAgICAgICAgKFdJLlJlbW90ZU9iamVjdC5wcm90 b3R5cGUuX2dldFByb3BlcnR5RGVzY3JpcHRvcnMpOiBEZWxldGVkLgorICAgICAgICAoV0kuUmVt b3RlT2JqZWN0LnByb3RvdHlwZS5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3JzQXNPYmplY3QpOiBE ZWxldGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9FcnJvck9iamVjdFZpZXcu anM6CisgICAgICAgIChXSS5FcnJvck9iamVjdFZpZXcucHJvdG90eXBlLnVwZGF0ZSk6CisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlUHJvcGVydHlUcmVlRWxlbWVudC5q czoKKyAgICAgICAgKFdJLk9iamVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS5f dXBkYXRlQ2hpbGRyZW4pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJl ZVZpZXcuanM6CisgICAgICAgIChXSS5PYmplY3RUcmVlVmlldy5wcm90b3R5cGUudXBkYXRlKToK KwogMjAxOC0xMC0yNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogQ2FudmFzIFJlY29yZGluZyBsb2FkaW5nIGdvZXMgc2lnbmlmaWNh bnRseSBzbG93ZXIgd2hlbiAiRnJhbWUiIHRyZWUgZWxlbWVudCBpcyBleHBhbmRlZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvUmVtb3Rl T2JqZWN0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wv UmVtb3RlT2JqZWN0LmpzCmluZGV4IDYzNTY0NmVjNzBmLi4xYzhkYWM3N2QwZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvUmVtb3RlT2Jq ZWN0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29s L1JlbW90ZU9iamVjdC5qcwpAQCAtMjYzLDE0ICsyNjMsMTQgQEAgV0kuUmVtb3RlT2JqZWN0ID0g Y2xhc3MgUmVtb3RlT2JqZWN0CiAgICAgICAgIH0pOwogICAgIH0KIAotICAgIGdldE93blByb3Bl cnR5RGVzY3JpcHRvcnMoY2FsbGJhY2spCisgICAgZ2V0UHJvcGVydHlEZXNjcmlwdG9ycyhjYWxs YmFjaywgb3B0aW9ucyA9IHt9KQogICAgIHsKLSAgICAgICAgdGhpcy5fZ2V0UHJvcGVydHlEZXNj cmlwdG9ycyh0cnVlLCBjYWxsYmFjayk7Ci0gICAgfQorICAgICAgICBpZiAoIXRoaXMuX29iamVj dElkIHx8IHRoaXMuX2lzU3ltYm9sKCkgfHwgdGhpcy5faXNGYWtlT2JqZWN0KCkpIHsKKyAgICAg ICAgICAgIGNhbGxiYWNrKFtdKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogCi0g ICAgZ2V0QWxsUHJvcGVydHlEZXNjcmlwdG9ycyhjYWxsYmFjaykKLSAgICB7Ci0gICAgICAgIHRo aXMuX2dldFByb3BlcnR5RGVzY3JpcHRvcnMoZmFsc2UsIGNhbGxiYWNrKTsKKyAgICAgICAgdGhp cy5fdGFyZ2V0LlJ1bnRpbWVBZ2VudC5nZXRQcm9wZXJ0aWVzKHRoaXMuX29iamVjdElkLCBvcHRp b25zLm93blByb3BlcnRpZXMsIG9wdGlvbnMuZ2VuZXJhdGVQcmV2aWV3LCB0aGlzLl9nZXRQcm9w ZXJ0eURlc2NyaXB0b3JzUmVzb2x2ZXIuYmluZCh0aGlzLCBjYWxsYmFjaykpOwogICAgIH0KIAog ICAgIGdldERpc3BsYXlhYmxlUHJvcGVydHlEZXNjcmlwdG9ycyhjYWxsYmFjaykKQEAgLTY1MSwx OSArNjUxLDkgQEAgV0kuUmVtb3RlT2JqZWN0ID0gY2xhc3MgUmVtb3RlT2JqZWN0CiAgICAgICAg IHJldHVybiBKU09OLnN0cmluZ2lmeSh0aGlzLl9vYmplY3RJZCkgKyAiLSIgKyB0aGlzLl9zdWJ0 eXBlOwogICAgIH0KIAotICAgIF9nZXRQcm9wZXJ0eURlc2NyaXB0b3JzKG93blByb3BlcnRpZXMs IGNhbGxiYWNrKQorICAgIGdldFByb3BlcnR5RGVzY3JpcHRvcnNBc09iamVjdChjYWxsYmFjaywg b3B0aW9ucyA9IHt9KQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9vYmplY3RJZCB8fCB0aGlz Ll9pc1N5bWJvbCgpIHx8IHRoaXMuX2lzRmFrZU9iamVjdCgpKSB7Ci0gICAgICAgICAgICBjYWxs YmFjayhbXSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICB0aGlz Ll90YXJnZXQuUnVudGltZUFnZW50LmdldFByb3BlcnRpZXModGhpcy5fb2JqZWN0SWQsIG93blBy b3BlcnRpZXMsIHRydWUsIHRoaXMuX2dldFByb3BlcnR5RGVzY3JpcHRvcnNSZXNvbHZlci5iaW5k KHRoaXMsIGNhbGxiYWNrKSk7Ci0gICAgfQotCi0gICAgZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9y c0FzT2JqZWN0KGNhbGxiYWNrKQotICAgIHsKLSAgICAgICAgdGhpcy5nZXRPd25Qcm9wZXJ0eURl c2NyaXB0b3JzKGZ1bmN0aW9uKHByb3BlcnRpZXMpIHsKKyAgICAgICAgdGhpcy5nZXRQcm9wZXJ0 eURlc2NyaXB0b3JzKGZ1bmN0aW9uKHByb3BlcnRpZXMpIHsKICAgICAgICAgICAgIHZhciBwcm9w ZXJ0aWVzUmVzdWx0ID0ge307CiAgICAgICAgICAgICB2YXIgaW50ZXJuYWxQcm9wZXJ0aWVzUmVz dWx0ID0ge307CiAgICAgICAgICAgICBmb3IgKHZhciBwcm9wZXJ0eURlc2NyaXB0b3Igb2YgcHJv cGVydGllcykgewpAQCAtNjcxLDcgKzY2MSw3IEBAIFdJLlJlbW90ZU9iamVjdCA9IGNsYXNzIFJl bW90ZU9iamVjdAogICAgICAgICAgICAgICAgIG9iamVjdFtwcm9wZXJ0eURlc2NyaXB0b3IubmFt ZV0gPSBwcm9wZXJ0eURlc2NyaXB0b3I7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBjYWxs YmFjayhwcm9wZXJ0aWVzUmVzdWx0LCBpbnRlcm5hbFByb3BlcnRpZXNSZXN1bHQpOwotICAgICAg ICB9KTsKKyAgICAgICAgfSwgb3B0aW9ucyk7CiAgICAgfQogCiAgICAgX2dldFByb3BlcnR5RGVz Y3JpcHRvcnNSZXNvbHZlcihjYWxsYmFjaywgZXJyb3IsIHByb3BlcnRpZXMsIGludGVybmFsUHJv cGVydGllcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0Vycm9yT2JqZWN0Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0Vycm9yT2JqZWN0Vmlldy5qcwppbmRleCBmNmQwZTc1NjcxNS4uMGFjYTFm NGQyNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0Vycm9yT2JqZWN0Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9FcnJvck9iamVjdFZpZXcuanMKQEAgLTkyLDE0ICs5MiwxOCBAQCBXSS5F cnJvck9iamVjdFZpZXcgPSBjbGFzcyBFcnJvck9iamVjdFZpZXcgZXh0ZW5kcyBXSS5PYmplY3QK IAogICAgIHVwZGF0ZSgpCiAgICAgewotICAgICAgICB0aGlzLl9vYmplY3QuZ2V0T3duUHJvcGVy dHlEZXNjcmlwdG9yc0FzT2JqZWN0KChwcm9wZXJ0aWVzKSA9PiB7CisgICAgICAgIGNvbnN0IG9w dGlvbnMgPSB7CisgICAgICAgICAgICBvd25Qcm9wZXJ0aWVzOiB0cnVlLAorICAgICAgICAgICAg Z2VuZXJhdGVQcmV2aWV3OiB0cnVlLAorICAgICAgICB9OworICAgICAgICB0aGlzLl9vYmplY3Qu Z2V0UHJvcGVydHlEZXNjcmlwdG9yc0FzT2JqZWN0KChwcm9wZXJ0aWVzKSA9PiB7CiAgICAgICAg ICAgICBjb25zb2xlLmFzc2VydChwcm9wZXJ0aWVzICYmIHByb3BlcnRpZXMuc3RhY2sgJiYgcHJv cGVydGllcy5zdGFjay52YWx1ZSk7CiAKICAgICAgICAgICAgIGlmICghdGhpcy5faGFzU3RhY2tU cmFjZSkKICAgICAgICAgICAgICAgICB0aGlzLl9idWlsZFN0YWNrVHJhY2UocHJvcGVydGllcy5z dGFjay52YWx1ZS52YWx1ZSk7CiAKICAgICAgICAgICAgIHRoaXMuX2hhc1N0YWNrVHJhY2UgPSB0 cnVlOwotICAgICAgICB9KTsKKyAgICAgICAgfSwgb3B0aW9ucyk7CiAgICAgfQogCiAgICAgZXhw YW5kKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL09iamVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQuanMK aW5kZXggNjM0ZTVlMjk2YzYuLjg1ZDY1NTZhNTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlUHJvcGVydHlUcmVlRWxlbWVu dC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmpl Y3RUcmVlUHJvcGVydHlUcmVlRWxlbWVudC5qcwpAQCAtMzIxLDEzICszMjEsMTggQEAgV0kuT2Jq ZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQgPSBjbGFzcyBPYmplY3RUcmVlUHJvcGVydHlUcmVl RWxlbWVudCBleHRlbmRzIFcKICAgICAgICAgaWYgKHRoaXMuY2hpbGRyZW4ubGVuZ3RoICYmICF0 aGlzLnNob3VsZFJlZnJlc2hDaGlsZHJlbikKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAg ICBjb25zdCBvcHRpb25zID0geworICAgICAgICAgICAgb3duUHJvcGVydGllczogdHJ1ZSwKKyAg ICAgICAgICAgIGdlbmVyYXRlUHJldmlldzogdHJ1ZSwKKyAgICAgICAgfTsKKwogICAgICAgICB2 YXIgcmVzb2x2ZWRWYWx1ZSA9IHRoaXMucmVzb2x2ZWRWYWx1ZSgpOwogICAgICAgICBpZiAocmVz b2x2ZWRWYWx1ZS5pc0NvbGxlY3Rpb25UeXBlKCkgJiYgdGhpcy5fbW9kZSA9PT0gV0kuT2JqZWN0 VHJlZVZpZXcuTW9kZS5Qcm9wZXJ0aWVzKQogICAgICAgICAgICAgcmVzb2x2ZWRWYWx1ZS5nZXRD b2xsZWN0aW9uRW50cmllcygwLCAxMDAsIHRoaXMuX3VwZGF0ZUNoaWxkcmVuSW50ZXJuYWwuYmlu ZCh0aGlzLCB0aGlzLl91cGRhdGVFbnRyaWVzLCB0aGlzLl9tb2RlKSk7CiAgICAgICAgIGVsc2Ug aWYgKHRoaXMuX21vZGUgPT09IFdJLk9iamVjdFRyZWVWaWV3Lk1vZGUuQ2xhc3NBUEkgfHwgdGhp cy5fbW9kZSA9PT0gV0kuT2JqZWN0VHJlZVZpZXcuTW9kZS5QdXJlQVBJKQotICAgICAgICAgICAg cmVzb2x2ZWRWYWx1ZS5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3JzKHRoaXMuX3VwZGF0ZUNoaWxk cmVuSW50ZXJuYWwuYmluZCh0aGlzLCB0aGlzLl91cGRhdGVQcm9wZXJ0aWVzLCBXSS5PYmplY3RU cmVlVmlldy5Nb2RlLkNsYXNzQVBJKSk7CisgICAgICAgICAgICByZXNvbHZlZFZhbHVlLmdldFBy b3BlcnR5RGVzY3JpcHRvcnModGhpcy5fdXBkYXRlQ2hpbGRyZW5JbnRlcm5hbC5iaW5kKHRoaXMs IHRoaXMuX3VwZGF0ZVByb3BlcnRpZXMsIFdJLk9iamVjdFRyZWVWaWV3Lk1vZGUuQ2xhc3NBUEkp LCBvcHRpb25zKTsKICAgICAgICAgZWxzZSBpZiAodGhpcy5wcm9wZXJ0eS5uYW1lID09PSAiX19w cm90b19fIikKLSAgICAgICAgICAgIHJlc29sdmVkVmFsdWUuZ2V0T3duUHJvcGVydHlEZXNjcmlw dG9ycyh0aGlzLl91cGRhdGVDaGlsZHJlbkludGVybmFsLmJpbmQodGhpcywgdGhpcy5fdXBkYXRl UHJvcGVydGllcywgV0kuT2JqZWN0VHJlZVZpZXcuTW9kZS5Qcm90b3R5cGVBUEkpKTsKKyAgICAg ICAgICAgIHJlc29sdmVkVmFsdWUuZ2V0UHJvcGVydHlEZXNjcmlwdG9ycyh0aGlzLl91cGRhdGVD aGlsZHJlbkludGVybmFsLmJpbmQodGhpcywgdGhpcy5fdXBkYXRlUHJvcGVydGllcywgV0kuT2Jq ZWN0VHJlZVZpZXcuTW9kZS5Qcm90b3R5cGVBUEkpLCBvcHRpb25zKTsKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgcmVzb2x2ZWRWYWx1ZS5nZXREaXNwbGF5YWJsZVByb3BlcnR5RGVzY3JpcHRv cnModGhpcy5fdXBkYXRlQ2hpbGRyZW5JbnRlcm5hbC5iaW5kKHRoaXMsIHRoaXMuX3VwZGF0ZVBy b3BlcnRpZXMsIHRoaXMuX21vZGUpKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlVmlldy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVWaWV3LmpzCmluZGV4 IGEwYmU4ZGI5YmNlLi41NTc0M2FhNGNmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuanMKQEAgLTI0 NiwxMiArMjQ2LDE3IEBAIFdJLk9iamVjdFRyZWVWaWV3ID0gY2xhc3MgT2JqZWN0VHJlZVZpZXcg ZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgIHVwZGF0ZSgpCiAgICAgeworICAgICAgICBjb25zdCBv cHRpb25zID0geworICAgICAgICAgICAgb3duUHJvcGVydGllczogdHJ1ZSwKKyAgICAgICAgICAg IGdlbmVyYXRlUHJldmlldzogdHJ1ZSwKKyAgICAgICAgfTsKKwogICAgICAgICBpZiAodGhpcy5f b2JqZWN0LmlzQ29sbGVjdGlvblR5cGUoKSAmJiB0aGlzLl9tb2RlID09PSBXSS5PYmplY3RUcmVl Vmlldy5Nb2RlLlByb3BlcnRpZXMpCiAgICAgICAgICAgICB0aGlzLl9vYmplY3QuZ2V0Q29sbGVj dGlvbkVudHJpZXMoMCwgMTAwLCB0aGlzLl91cGRhdGVDaGlsZHJlbi5iaW5kKHRoaXMsIHRoaXMu X3VwZGF0ZUVudHJpZXMpKTsKICAgICAgICAgZWxzZSBpZiAodGhpcy5fb2JqZWN0LmlzQ2xhc3Mo KSkKICAgICAgICAgICAgIHRoaXMuX29iamVjdC5jbGFzc1Byb3RvdHlwZS5nZXREaXNwbGF5YWJs ZVByb3BlcnR5RGVzY3JpcHRvcnModGhpcy5fdXBkYXRlQ2hpbGRyZW4uYmluZCh0aGlzLCB0aGlz Ll91cGRhdGVQcm9wZXJ0aWVzKSk7CiAgICAgICAgIGVsc2UgaWYgKHRoaXMuX21vZGUgPT09IFdJ Lk9iamVjdFRyZWVWaWV3Lk1vZGUuUHVyZUFQSSkKLSAgICAgICAgICAgIHRoaXMuX29iamVjdC5n ZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3JzKHRoaXMuX3VwZGF0ZUNoaWxkcmVuLmJpbmQodGhpcywg dGhpcy5fdXBkYXRlUHJvcGVydGllcykpOworICAgICAgICAgICAgdGhpcy5fb2JqZWN0LmdldFBy b3BlcnR5RGVzY3JpcHRvcnModGhpcy5fdXBkYXRlQ2hpbGRyZW4uYmluZCh0aGlzLCB0aGlzLl91 cGRhdGVQcm9wZXJ0aWVzKSwgb3B0aW9ucyk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHRo aXMuX29iamVjdC5nZXREaXNwbGF5YWJsZVByb3BlcnR5RGVzY3JpcHRvcnModGhpcy5fdXBkYXRl Q2hpbGRyZW4uYmluZCh0aGlzLCB0aGlzLl91cGRhdGVQcm9wZXJ0aWVzKSk7CiAgICAgfQo=