188824 2018-08-21 15:40:54 -0700 Web Inspector: Address some ESLint warnings 2018-09-10 16:48:47 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1452354 0 joepeck 2018-08-21 15:40:54 -0700 Address some ESLint warnings A few were real logic mistakes. 1452357 1 347715 joepeck 2018-08-21 15:41:46 -0700 Created attachment 347715 [PATCH] Proposed Fix 1452367 2 347715 mattbaker 2018-08-21 15:55:28 -0700 Comment on attachment 347715 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=347715&action=review r=me > Source/WebInspectorUI/UserInterface/Controllers/AuditManager.js:39 > + if (!(newTestSuite instanceof WI.AuditTestSuite)) Yikes 1458313 3 joepeck 2018-09-10 16:47:59 -0700 <https://trac.webkit.org/changeset/235873/webkit> 1458314 4 webkit-bug-importer 2018-09-10 16:48:47 -0700 <rdar://problem/44322766> 347715 2018-08-21 15:41:46 -0700 2018-09-10 16:47:50 -0700 [PATCH] Proposed Fix eslint-1.patch text/plain 26772 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS8uZXNsaW50cmMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvLmVzbGludHJjCmluZGV4IDIxYjczZjUxYTA3Li41ZTZkZjU5OWVkZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJLy5lc2xpbnRyYworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvLmVzbGludHJjCkBAIC01NCw2ICs1NCw3IEBACiAgICAgICAgICJSZWNvcmRp bmdBZ2VudCI6IHRydWUsCiAgICAgICAgICJSdW50aW1lQWdlbnQiOiB0cnVlLAogICAgICAgICAi U2NyaXB0UHJvZmlsZXJBZ2VudCI6IHRydWUsCisgICAgICAgICJTZXJ2aWNlV29ya2VyQWdlbnQi OiB0cnVlLAogICAgICAgICAiVGltZWxpbmVBZ2VudCI6IHRydWUsCiAgICAgICAgICJXb3JrZXJB Z2VudCI6IHRydWUsCiAKQEAgLTk4LDYgKzk5LDcgQEAKICAgICAgICAgIkNTU1ByaW1pdGl2ZVZh bHVlIjogdHJ1ZSwKICAgICAgICAgIkV4Y2VwdGlvbiI6IHRydWUsCiAgICAgICAgICJXZWJLaXRQ b2ludCI6IHRydWUsCisgICAgICAgICJTUUxFcnJvciI6IHRydWUsCiAKICAgICAgICAgLy8gVXRp bGl0aWVzCiAgICAgICAgICJhcHBlbmRXZWJJbnNwZWN0b3JDb25zb2xlRXZhbHVhdGlvblNvdXJj ZVVSTCI6IHRydWUsCkBAIC0xMjIsNiArMTI0LDcgQEAKICAgICAgICAgInBhcnNlTUlNRVR5cGUi OiB0cnVlLAogICAgICAgICAicmVzb2x2ZURvdHNJblBhdGgiOiB0cnVlLAogICAgICAgICAic2lt cGxlR2xvYlN0cmluZ1RvUmVnRXhwIjogdHJ1ZSwKKyAgICAgICAgInRleHRUb0Jsb2IiOiB0cnVl LAogICAgICAgICAidGltZXN0YW1wIjogdHJ1ZSwKICAgICAgICAgInplcm9XaWR0aFNwYWNlIjog dHJ1ZSwKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXggOTcwMzhkYmYzMmYuLjdjNjczMDYw N2Y2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOCBAQAorMjAxOC0wOC0y MSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJ bnNwZWN0b3I6IEFkZHJlc3Mgc29tZSBFU0xpbnQgd2FybmluZ3MKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODgyNAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogLmVzbGludHJjOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvQmFzZS9QbGF0Zm9ybS5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Nv bnRyb2xsZXJzL0F1ZGl0TWFuYWdlci5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0Jhc2ljQmxvY2tBbm5vdGF0b3IuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9D b250cm9sbGVycy9DYWxsRnJhbWVUcmVlQ29udHJvbGxlci5qczoKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL0hBUkJ1aWxkZXIuanM6CisgICAgICAgICogVXNlckludGVyZmFj ZS9Nb2RlbHMvQXVkaXRSZXBvcnQuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMv QXVkaXRSZXN1bHQuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvQXVkaXRUZXN0 Q2FzZS5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9BdWRpdFRlc3RTdWl0ZS5q czoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9Db29raWUuanM6CisgICAgICAgICog VXNlckludGVyZmFjZS9Nb2RlbHMvU291cmNlQ29kZVBvc2l0aW9uLmpzOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVGVzdC9Gcm9udGVuZFRlc3RIYXJuZXNzLmpzOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVGVzdC9UZXN0U3VpdGUuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9DYW52YXNDb250ZW50Vmlldy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Nv bGxlY3Rpb25Db250ZW50Vmlldy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Nv bnRlbnRCcm93c2VyLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3Rv cmFnZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdy aWQuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EYXRhYmFzZVRhYmxlQ29udGVu dFZpZXcuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvSlNPTlJlc291cmNlQ29udGVudFZpZXcuanM6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qczoKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanM6CisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qczoKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1dvcmtlcnMvRm9ybWF0dGVyL0Zvcm1hdHRlclV0aWxpdGllcy5qczoK KwogMjAxOC0wOC0yMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IOKMmEcgZG9lcyBub3Qgd2hpbGUgZmluZCBiYW5uZXIgaXMg Zm9jdXNlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9QbGF0Zm9ybS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jh c2UvUGxhdGZvcm0uanMKaW5kZXggYzgyZTAxMjM4ZDAuLjRmMmUxZTdjMDkzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1BsYXRmb3JtLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvUGxhdGZvcm0uanMK QEAgLTQ5LDcgKzQ5LDcgQEAgV0kuUGxhdGZvcm0gPSB7CiAgICAgICAgIFdJLlBsYXRmb3JtLnZl cnNpb24uYmFzZSA9IDEwOwogICAgICAgICBXSS5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSBw YXJzZUludChvc1ZlcnNpb25NYXRjaFsyXSk7CiAgICAgICAgIHN3aXRjaCAob3NWZXJzaW9uTWF0 Y2hbMl0pIHsKLSAgICAgICAgY2FzZSAiMTIiOgorICAgICAgICBjYXNlICIxMyI6CiAgICAgICAg ICAgICBXSS5QbGF0Zm9ybS52ZXJzaW9uLm5hbWUgPSAiaGlnaC1zaWVycmEiOwogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIGNhc2UgIjEyIjoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0F1ZGl0TWFuYWdlci5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0F1ZGl0TWFuYWdlci5q cwppbmRleCA1MmY2OGEwZDcwOS4uNWJkYzQyYTA0MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0F1ZGl0TWFuYWdlci5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9BdWRpdE1h bmFnZXIuanMKQEAgLTIzLDcgKzIzLDcgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KICAqLwogCi0gV0kuQXVkaXRNYW5hZ2VyID0gY2xhc3MgQXVkaXRNYW5hZ2VyIGV4dGVu ZHMgV0kuT2JqZWN0CitXSS5BdWRpdE1hbmFnZXIgPSBjbGFzcyBBdWRpdE1hbmFnZXIgZXh0ZW5k cyBXSS5PYmplY3QKIHsKICAgICBjb25zdHJ1Y3RvcigpCiAgICAgewpAQCAtMzEsMTIgKzMxLDEy IEBACiAKICAgICAgICAgdGhpcy5fdGVzdFN1aXRlQ29uc3RydWN0b3JzID0gW107CiAgICAgICAg IHRoaXMuX3JlcG9ydHMgPSBuZXcgTWFwOwotICAgICAgICAKKwogICAgICAgICAvLyBUcmFuc2Zv cm1pbmcgYWxsIHRoZSBjb25zdHJ1Y3RvcnMgaW50byBBdWRpdFRlc3RTdWl0ZSBpbnN0YW5jZXMu Ci0gICAgICAgIHRoaXMuX3Rlc3RTdWl0ZXMgPSB0aGlzLl90ZXN0U3VpdGVDb25zdHJ1Y3RvcnMu bWFwKHN1aXRlID0+ICB7CisgICAgICAgIHRoaXMuX3Rlc3RTdWl0ZXMgPSB0aGlzLl90ZXN0U3Vp dGVDb25zdHJ1Y3RvcnMubWFwKHN1aXRlID0+IHsKICAgICAgICAgICAgIGxldCBuZXdUZXN0U3Vp dGUgPSBuZXcgc3VpdGU7CiAKLSAgICAgICAgICAgIGlmICghbmV3VGVzdFN1aXRlIGluc3RhbmNl b2YgV0kuQXVkaXRUZXN0U3VpdGUpCisgICAgICAgICAgICBpZiAoIShuZXdUZXN0U3VpdGUgaW5z dGFuY2VvZiBXSS5BdWRpdFRlc3RTdWl0ZSkpCiAgICAgICAgICAgICAgICAgdGhyb3cgbmV3IEVy cm9yKCJBdWRpdCB0ZXN0IHN1aXRlcyBtdXN0IGJlIG9mIGluc3RhbmNlIFdJLkF1ZGl0VGVzdFN1 aXRlLiIpOwogCiAgICAgICAgICAgICByZXR1cm4gbmV3VGVzdFN1aXRlOwpAQCAtNTYsMTEgKzU2 LDExIEBACiAgICAgICAgICAgICBsZXQgYXVkaXRSZXN1bHQgPSBhd2FpdCB0aGlzLl9ydW5UZXN0 Q2FzZShyZXByZXNlbnRlZE9iamVjdCk7CiAgICAgICAgICAgICBhdWRpdFJlcG9ydC5hZGRSZXN1 bHQoYXVkaXRSZXN1bHQpOwogICAgICAgICB9IGVsc2UgaWYgKHJlcHJlc2VudGVkT2JqZWN0IGlu c3RhbmNlb2YgV0kuQXVkaXRUZXN0U3VpdGUpIHsKLSAgICAgICAgICAgIGxldCB0ZXN0Q2FzZXMg PSByZXByZXNlbnRlZE9iamVjdC50ZXN0Q2FzZXM7ICAgICAgICAgICAgCisgICAgICAgICAgICBs ZXQgdGVzdENhc2VzID0gcmVwcmVzZW50ZWRPYmplY3QudGVzdENhc2VzOwogICAgICAgICAgICAg Ly8gU3RhcnQgcmVkdWNpbmcgZnJvbSB0ZXN0Q2FzZXNbMF0uCiAgICAgICAgICAgICBsZXQgcmVz dWx0ID0gdGVzdENhc2VzLnNsaWNlKDEpLnJlZHVjZSgoY2hhaW4sIHRlc3RDYXNlLCBpbmRleCkg PT4gewogICAgICAgICAgICAgICAgIGlmICh0ZXN0Q2FzZS5zZXR1cCkgewotICAgICAgICAgICAg ICAgICAgICBsZXQgc2V0dXAgPSB0ZXN0Q2FzZS5zZXR1cC5jYWxsKHRlc3RDYXNlLCB0ZXN0Q2Fz ZS5zdWl0ZSkKKyAgICAgICAgICAgICAgICAgICAgbGV0IHNldHVwID0gdGVzdENhc2Uuc2V0dXAu Y2FsbCh0ZXN0Q2FzZSwgdGVzdENhc2Uuc3VpdGUpOwogICAgICAgICAgICAgICAgICAgICBpZiAo dGVzdENhc2Uuc2V0dXBbU3ltYm9sLnRvU3RyaW5nVGFnXSA9PT0gIkFzeW5jRnVuY3Rpb24iKQog ICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHNldHVwOwogICAgICAgICAgICAgICAgICAg ICBlbHNlCkBAIC03Myw3ICs3Myw3IEBACiAgICAgICAgICAgICAgICAgfSk7CiAKICAgICAgICAg ICAgICAgICBpZiAodGVzdENhc2UudGVhckRvd24pIHsKLSAgICAgICAgICAgICAgICAgICAgbGV0 IHRlYXJEb3duID0gdGVzdENhc2UudGVhckRvd24uY2FsbCh0ZXN0Q2FzZSwgdGVzdENhc2Uuc3Vp dGUpCisgICAgICAgICAgICAgICAgICAgIGxldCB0ZWFyRG93biA9IHRlc3RDYXNlLnRlYXJEb3du LmNhbGwodGVzdENhc2UsIHRlc3RDYXNlLnN1aXRlKTsKICAgICAgICAgICAgICAgICAgICAgaWYg KHRlc3RDYXNlLnRlYXJEb3duW1N5bWJvbC50b1N0cmluZ1RhZ10gPT09ICJBc3luY0Z1bmN0aW9u IikKICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0ZWFyRG93bjsKICAgICAgICAgICAg ICAgICAgICAgZWxzZQpAQCAtMTMxLDkgKzEzMSw5IEBACiAgICAgICAgIHRoaXMuZGlzcGF0Y2hF dmVudFRvTGlzdGVuZXJzKFdJLkF1ZGl0TWFuYWdlci5FdmVudC5UZXN0RW5kZWQsIHt0ZXN0OiB0 ZXN0Q2FzZX0pOwogICAgICAgICByZXR1cm4gbmV3IFdJLkF1ZGl0UmVzdWx0KHRlc3RDYXNlLCB7 cmVzdWx0fSwgZGlkUmFpc2VFeGNlcHRpb24pOwogICAgIH0KLX0KK307CiAKIFdJLkF1ZGl0TWFu YWdlci5FdmVudCA9IHsKICAgICBUZXN0U3RhcnRlZDogU3ltYm9sKCJ0ZXN0LXN0YXJ0ZWQiKSwK ICAgICBUZXN0RW5kZWQ6IFN5bWJvbCgidGVzdC1lbmRlZCIpCi19Cit9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQmFzaWNCbG9j a0Fubm90YXRvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0Jhc2ljQmxvY2tBbm5vdGF0b3IuanMKaW5kZXggOWNhOWEyMmViYmYuLjJiYjBlMDQ1 ODQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9CYXNpY0Jsb2NrQW5ub3RhdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0Jhc2ljQmxvY2tBbm5vdGF0b3IuanMKQEAgLTYz LDcgKzYzLDcgQEAgV0kuQmFzaWNCbG9ja0Fubm90YXRvciA9IGNsYXNzIEJhc2ljQmxvY2tBbm5v dGF0b3IgZXh0ZW5kcyBXSS5Bbm5vdGF0b3IKICAgICAgICAgd2hpbGUgKG1hdGNoKSB7CiAgICAg ICAgICAgICBsaW5lRW5kaW5ncy5wdXNoKG1hdGNoLmluZGV4KTsKICAgICAgICAgICAgIGxpbmVF bmRpbmdMZW5ndGhzLnB1c2gobWF0Y2hbMF0ubGVuZ3RoKTsKLSAgICAgICAgICAgIG1hdGNoID0g cGF0dGVybi5leGVjKGNvbnRlbnQpCisgICAgICAgICAgICBtYXRjaCA9IHBhdHRlcm4uZXhlYyhj b250ZW50KTsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIG9mZnNldFRvUG9zaXRpb24o b2Zmc2V0KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9DYWxsRnJhbWVUcmVlQ29udHJvbGxlci5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NhbGxGcmFtZVRyZWVDb250cm9sbGVy LmpzCmluZGV4IDMyZDM4ODEwYjYwLi40YTNmMjEwZDExYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ2FsbEZyYW1lVHJlZUNvbnRy b2xsZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvQ2FsbEZyYW1lVHJlZUNvbnRyb2xsZXIuanMKQEAgLTU5LDcgKzU5LDcgQEAgV0kuQ2Fs bEZyYW1lVHJlZUNvbnRyb2xsZXIgPSBjbGFzcyBDYWxsRnJhbWVUcmVlQ29udHJvbGxlciBleHRl bmRzIFdJLk9iamVjdAogICAgICAgICB0aGlzLl90cmVlT3V0bGluZS5yZW1vdmVDaGlsZHJlbigp OwogCiAgICAgICAgIGZvciAobGV0IGNhbGxGcmFtZSBvZiB0aGlzLl9jYWxsRnJhbWVzKQotICAg ICAgICAgICAgdGhpcy5fdHJlZU91dGxpbmUuYXBwZW5kQ2hpbGQobmV3IFdJLkNhbGxGcmFtZVRy ZWVFbGVtZW50KGNhbGxGcmFtZSkpCisgICAgICAgICAgICB0aGlzLl90cmVlT3V0bGluZS5hcHBl bmRDaGlsZChuZXcgV0kuQ2FsbEZyYW1lVHJlZUVsZW1lbnQoY2FsbEZyYW1lKSk7CiAgICAgfQog CiAgICAgZGlzY29ubmVjdCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9IQVJCdWlsZGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSEFSQnVpbGRlci5qcwppbmRleCBhZjZlYTZh NzU2NC4uNmZiZmU0OTUyNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL0hBUkJ1aWxkZXIuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSEFSQnVpbGRlci5qcwpAQCAtMzA4LDQg KzMwOCw0IEBAIFdJLkhBUkJ1aWxkZXIgPSBjbGFzcyBIQVJCdWlsZGVyCiAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KGZhbHNlKTsKICAgICAgICAgcmV0dXJuIHVuZGVmaW5lZDsKICAgICB9Ci19Cit9 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxz L0F1ZGl0UmVwb3J0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL0F1ZGl0UmVwb3J0LmpzCmluZGV4IDZjYjgzMDU3ZTcwLi42MmFkMDlkZGU2YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0F1ZGl0UmVw b3J0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9B dWRpdFJlcG9ydC5qcwpAQCAtMjMsMTIgKzIzLDEyIEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCiAgKi8KIAotIFdJLkF1ZGl0UmVwb3J0ID0gY2xhc3MgQXVkaXRSZXBvcnQK K1dJLkF1ZGl0UmVwb3J0ID0gY2xhc3MgQXVkaXRSZXBvcnQKIHsKICAgICBjb25zdHJ1Y3Rvcihy ZXByZXNlbnRlZFRlc3QpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChyZXByZXNlbnRl ZFRlc3QgaW5zdGFuY2VvZiBXSS5BdWRpdFRlc3RDYXNlIHx8IHJlcHJlc2VudGVkVGVzdCBpbnN0 YW5jZW9mIFdJLkF1ZGl0VGVzdFN1aXRlKTsKLSAgICAgICAgCisKICAgICAgICAgdGhpcy5fcmVz dWx0cyA9IFtdOwogICAgICAgICB0aGlzLl9pc1dyaXRhYmxlID0gdHJ1ZTsKICAgICAgICAgdGhp cy5fcmVwcmVzZW50ZWRUZXN0Q2FzZXMgPSAocmVwcmVzZW50ZWRUZXN0IGluc3RhbmNlb2YgV0ku QXVkaXRUZXN0Q2FzZSkgPyBbcmVwcmVzZW50ZWRUZXN0XSA6IFsuLi5yZXByZXNlbnRlZFRlc3Qu dGVzdENhc2VzXTsKQEAgLTU5LDQgKzU5LDQgQEAKICAgICB7CiAgICAgICAgIHRoaXMuX2lzV3Jp dGFibGUgPSBmYWxzZTsKICAgICB9Ci19Cit9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0F1ZGl0UmVzdWx0LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0F1ZGl0UmVzdWx0LmpzCmluZGV4IGVlOWJh MWJhYTZjLi40NjYzYTIwZTA0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTW9kZWxzL0F1ZGl0UmVzdWx0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9BdWRpdFJlc3VsdC5qcwpAQCAtMjMsNyArMjMsNyBA QAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLSBXSS5BdWRpdFJl c3VsdCA9IGNsYXNzIEF1ZGl0UmVzdWx0CitXSS5BdWRpdFJlc3VsdCA9IGNsYXNzIEF1ZGl0UmVz dWx0CiB7CiAgICAgY29uc3RydWN0b3IodGVzdEluc3RhbmNlLCB0ZXN0UmVzdWx0LCBmYWlsZWQp CiAgICAgewpAQCAtNDMsMTAgKzQzLDEwIEBACiAgICAgZ2V0IG5hbWUoKSB7IHJldHVybiB0aGlz Ll90ZXN0TmFtZTsgfQogICAgIGdldCBsb2dMZXZlbCgpIHsgcmV0dXJuIHRoaXMuX2xvZ0xldmVs OyB9CiAgICAgZ2V0IGZhaWxlZCgpIHsgcmV0dXJuIHRoaXMuX2ZhaWxlZDsgfQotfQorfTsKIAog V0kuQXVkaXRSZXN1bHQuTG9nTGV2ZWwgPSB7CiAgICAgRXJyb3I6ICJlcnJvciIsCiAgICAgV2Fy bmluZzogIndhcm5pbmciLAogICAgIFBhc3NlZDogInBhc3NlZCIKLX0KK307CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQXVkaXRUZXN0Q2Fz ZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9BdWRpdFRl c3RDYXNlLmpzCmluZGV4IDQ1NDdlMjQzZDlkLi5kNzM4MDBkOGU3YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0F1ZGl0VGVzdENhc2UuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0F1ZGl0VGVz dENhc2UuanMKQEAgLTIzLDEzICsyMywxMyBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgogICovCiAKLSBXSS5BdWRpdFRlc3RDYXNlID0gY2xhc3MgQXVkaXRUZXN0Q2FzZSBl eHRlbmRzIFdJLk9iamVjdAorV0kuQXVkaXRUZXN0Q2FzZSA9IGNsYXNzIEF1ZGl0VGVzdENhc2Ug ZXh0ZW5kcyBXSS5PYmplY3QKIHsKICAgICBjb25zdHJ1Y3RvcihzdWl0ZSwgbmFtZSwgdGVzdCwg c2V0dXAsIHRlYXJEb3duLCBlcnJvckRldGFpbHMgPSB7fSkKICAgICB7CiAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KHN1aXRlIGluc3RhbmNlb2YgV0kuQXVkaXRUZXN0U3VpdGUpOwotICAgICAgICBj b25zb2xlLmFzc2VydCh0eXBlb2YobmFtZSkgPT09ICJzdHJpbmciKTsKLSAgICAgICAgCisgICAg ICAgIGNvbnNvbGUuYXNzZXJ0KHR5cGVvZiBuYW1lID09PSAic3RyaW5nIik7CisKICAgICAgICAg aWYgKHNldHVwKQogICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoc2V0dXAgaW5zdGFuY2VvZiBG dW5jdGlvbik7CiAKQEAgLTQxLDcgKzQxLDcgQEAKIAogICAgICAgICBzdXBlcigpOwogICAgICAg ICB0aGlzLl9pZCA9IFN5bWJvbChuYW1lKTsKLSAgICAgICAgCisKICAgICAgICAgdGhpcy5fc3Vp dGUgPSBzdWl0ZTsKICAgICAgICAgdGhpcy5fbmFtZSA9IG5hbWU7CiAgICAgICAgIHRoaXMuX3Rl c3QgPSB0ZXN0OwpAQCAtNTksNCArNTksNCBAQAogICAgIGdldCBzZXR1cCgpIHsgcmV0dXJuIHRo aXMuX3NldHVwOyB9CiAgICAgZ2V0IHRlYXJEb3duKCkgeyByZXR1cm4gdGhpcy5fdGVhckRvd247 IH0KICAgICBnZXQgZXJyb3JEZXRhaWxzKCkgeyByZXR1cm4gdGhpcy5fZXJyb3JEZXRhaWxzOyB9 Ci19Cit9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL0F1ZGl0VGVzdFN1aXRlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTW9kZWxzL0F1ZGl0VGVzdFN1aXRlLmpzCmluZGV4IGYwNzNlZjRhZDE3Li41MmNmZWFk ZGQ2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL0F1ZGl0VGVzdFN1aXRlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9BdWRpdFRlc3RTdWl0ZS5qcwpAQCAtMjMsNyArMjMsNyBAQAogICogVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLSBXSS5BdWRpdFRlc3RTdWl0ZSA9 IGNsYXNzIEF1ZGl0VGVzdFN1aXRlIGV4dGVuZHMgV0kuT2JqZWN0CitXSS5BdWRpdFRlc3RTdWl0 ZSA9IGNsYXNzIEF1ZGl0VGVzdFN1aXRlIGV4dGVuZHMgV0kuT2JqZWN0CiB7CiAgICAgY29uc3Ry dWN0b3IoaWRlbnRpZmllciwgbmFtZSkKICAgICB7CkBAIC01MCwxMiArNTAsMTIgQEAKICAgICBf YnVpbGRUZXN0Q2FzZXNGcm9tRGVzY3JpcHRvcnMoKQogICAgIHsKICAgICAgICAgZm9yIChsZXQg ZGVzY3JpcHRvciBvZiB0aGlzLmNvbnN0cnVjdG9yLnRlc3RDYXNlRGVzY3JpcHRvcnMoKSkgewot ICAgICAgICAgICAgaWYgKHR5cGVvZihkZXNjcmlwdG9yLm5hbWUpICE9PSAic3RyaW5nIiB8fCAh ZGVzY3JpcHRvci5uYW1lKQorICAgICAgICAgICAgaWYgKHR5cGVvZiBkZXNjcmlwdG9yLm5hbWUg IT09ICJzdHJpbmciIHx8ICFkZXNjcmlwdG9yLm5hbWUpCiAgICAgICAgICAgICAgICAgdGhyb3cg bmV3IEVycm9yKCJUZXN0IG5hbWUgbXVzdCBiZSBhIHZhbGlkIHN0cmluZy4iKTsKLSAgICAgICAg ICAgIAorCiAgICAgICAgICAgICBsZXQge25hbWUsIHRlc3QsIHNldHVwLCB0ZWFyRG93biwgZXJy b3JEZXRhaWxzfSA9IGRlc2NyaXB0b3I7CiAKLSAgICAgICAgICAgIGlmICghdGVzdCBpbnN0YW5j ZW9mIEZ1bmN0aW9uIHx8IHRlc3RbU3ltYm9sLnRvU3RyaW5nVGFnXSAhPT0gIkFzeW5jRnVuY3Rp b24iKQorICAgICAgICAgICAgaWYgKCEodGVzdCBpbnN0YW5jZW9mIEZ1bmN0aW9uKSB8fCB0ZXN0 W1N5bWJvbC50b1N0cmluZ1RhZ10gIT09ICJBc3luY0Z1bmN0aW9uIikKICAgICAgICAgICAgICAg ICB0aHJvdyBuZXcgRXJyb3IoIlRlc3QgZnVuY3Rpb24gbXVzdCBiZSBhbiBhc3luYyBmdW5jdGlv bi4iKTsKIAogICAgICAgICAgICAgbGV0IHRlc3RDYXNlSW5zdGFuY2UgPSBuZXcgV0kuQXVkaXRU ZXN0Q2FzZSh0aGlzLCBuYW1lLCB0ZXN0LCBzZXR1cCwgdGVhckRvd24sIGVycm9yRGV0YWlscyk7 CkBAIC02Myw4ICs2Myw4IEBACiAgICAgICAgICAgICB0aGlzLl90ZXN0Q2FzZXMuc2V0KHRlc3RD YXNlSW5zdGFuY2UuaWQsIHRlc3RDYXNlSW5zdGFuY2UpOwogICAgICAgICB9CiAgICAgfQotfQor fTsKIAogV0kuQXVkaXRUZXN0U3VpdGUuRXZlbnQgPSB7CiAgICAgTmV3QXVkaXRSZXN1bHRBdmFp bGFibGU6IFN5bWJvbCgibmV3LWF1ZGl0LXJlc3VsdC1hdmFpbGFibGUiKQotfSAgIAorfTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Db29r aWUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ29va2ll LmpzCmluZGV4IGNkMmFkNGUwMjZlLi40NjcyOTQyNjk1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0Nvb2tpZS5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ29va2llLmpzCkBAIC0yMTQsNyAr MjE0LDcgQEAgV0kuQ29va2llID0gY2xhc3MgQ29va2llCiAKICAgICAgICAgcmV0dXJuIG5ldyBX SS5Db29raWUoV0kuQ29va2llLlR5cGUuUmVzcG9uc2UsIG5hbWUsIHZhbHVlLCBoZWFkZXIsIGV4 cGlyZXMsIG1heEFnZSwgcGF0aCwgZG9tYWluLCBzZWN1cmUsIGh0dHBPbmx5LCBzYW1lU2l0ZSk7 CiAgICAgfQotfQorfTsKIAogV0kuQ29va2llLlR5cGUgPSB7CiAgICAgUmVxdWVzdDogInJlcXVl c3QiLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL1NvdXJjZUNvZGVQb3NpdGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9Tb3VyY2VDb2RlUG9zaXRpb24uanMKaW5kZXggN2UzMDYwZjlmNDAuLjE3 YTBhOWYwMDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvU291cmNlQ29kZVBvc2l0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9Tb3VyY2VDb2RlUG9zaXRpb24uanMKQEAgLTQyLDEyICs0 Miw2IEBAIFdJLlNvdXJjZUNvZGVQb3NpdGlvbiA9IGNsYXNzIFNvdXJjZUNvZGVQb3NpdGlvbgog ICAgICAgICByZXR1cm4gbmV3IFdJLlNvdXJjZUNvZGVQb3NpdGlvbih0aGlzLl9saW5lTnVtYmVy LCB0aGlzLl9jb2x1bW5OdW1iZXIgKyBkZWx0YSk7CiAgICAgfQogCi0gICAgb2Zmc2V0Q29sdW1u KGRlbHRhKQotICAgIHsKLSAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fY29sdW1uTnVtYmVy ICsgZGVsdGEgPj0gMCk7Ci0gICAgICAgIHJldHVybiBuZXcgV0kuU291cmNlQ29kZVBvc2l0aW9u KHRoaXMuX2xpbmVOdW1iZXIsIHRoaXMuX2NvbHVtbk51bWJlciArIGRlbHRhKTsKLSAgICB9Ci0K ICAgICBlcXVhbHMocG9zaXRpb24pCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fbGluZU51 bWJlciA9PT0gcG9zaXRpb24ubGluZU51bWJlciAmJiB0aGlzLl9jb2x1bW5OdW1iZXIgPT09IHBv c2l0aW9uLmNvbHVtbk51bWJlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1Rlc3QvRnJvbnRlbmRUZXN0SGFybmVzcy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvRnJvbnRlbmRUZXN0SGFybmVzcy5qcwppbmRleCAw MjMxOTVmODlmNy4uNGZiZjlhNDgyNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1Rlc3QvRnJvbnRlbmRUZXN0SGFybmVzcy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0L0Zyb250ZW5kVGVzdEhhcm5lc3MuanMK QEAgLTk0LDcgKzk0LDcgQEAgRnJvbnRlbmRUZXN0SGFybmVzcyA9IGNsYXNzIEZyb250ZW5kVGVz dEhhcm5lc3MgZXh0ZW5kcyBUZXN0SGFybmVzcwogICAgICAgICAgICAgcmV0dXJuICghcmVtb3Rl T2JqZWN0T25seSAmJiByZW1vdGVPYmplY3QuaGFzVmFsdWUoKSkgPyByZW1vdGVPYmplY3QudmFs dWUgOiByZW1vdGVPYmplY3Q7CiAgICAgICAgIH0KIAotICAgICAgICBsZXQgcmVzcG9uc2UgPSBS dW50aW1lQWdlbnQuZXZhbHVhdGUuaW52b2tlKHtleHByZXNzaW9uLCBvYmplY3RHcm91cDogInRl c3QiLCBpbmNsdWRlQ29tbWFuZExpbmVBUEk6IGZhbHNlfSkKKyAgICAgICAgbGV0IHJlc3BvbnNl ID0gUnVudGltZUFnZW50LmV2YWx1YXRlLmludm9rZSh7ZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXA6 ICJ0ZXN0IiwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJOiBmYWxzZX0pOwogICAgICAgICBpZiAoY2Fs bGJhY2sgJiYgdHlwZW9mIGNhbGxiYWNrID09PSAiZnVuY3Rpb24iKSB7CiAgICAgICAgICAgICBy ZXNwb25zZSA9IHJlc3BvbnNlLnRoZW4oKHtyZXN1bHQsIHdhc1Rocm93bn0pID0+IGNhbGxiYWNr KG51bGwsIHRyYW5zbGF0ZVJlc3VsdChyZXN1bHQpLCB3YXNUaHJvd24pKTsKICAgICAgICAgICAg IHJlc3BvbnNlID0gcmVzcG9uc2UuY2F0Y2goKGVycm9yKSA9PiBjYWxsYmFjayhlcnJvciwgbnVs bCwgZmFsc2UpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1Rlc3QvVGVzdFN1aXRlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVGVzdC9UZXN0U3VpdGUuanMKaW5kZXggNzllYTVjYmY2ZGIuLjNlMTdmZGY0MmExIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0L1Rlc3RTdWl0 ZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0L1Rlc3RT dWl0ZS5qcwpAQCAtMTgyLDcgKzE4Miw3IEBAIFN5bmNUZXN0U3VpdGUgPSBjbGFzcyBTeW5jVGVz dFN1aXRlIGV4dGVuZHMgVGVzdFN1aXRlCiAgICAgYWRkVGVzdENhc2UodGVzdGNhc2UpCiAgICAg ewogICAgICAgICBpZiAoW3Rlc3RjYXNlLnNldHVwLCB0ZXN0Y2FzZS50ZWFyZG93biwgdGVzdGNh c2UudGVzdF0uc29tZSgoZm4pID0+IGZuICYmIGZuW1N5bWJvbC50b1N0cmluZ1RhZ10gPT09ICJB c3luY0Z1bmN0aW9uIikpCi0gICAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoIlRyaWVkIHRvIHBh c3MgYSB0ZXN0IGNhc2Ugd2l0aCBhbiBhc3luYyBgc2V0dXBgLCBgdGVzdGAsIG9yIGB0ZWFyZG93 bmAgZnVuY3Rpb24sIGJ1dCB0aGlzIGlzIGEgc3luY2hyb25vdXMgdGVzdCBzdWl0ZS4iKQorICAg ICAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJUcmllZCB0byBwYXNzIGEgdGVzdCBjYXNlIHdpdGgg YW4gYXN5bmMgYHNldHVwYCwgYHRlc3RgLCBvciBgdGVhcmRvd25gIGZ1bmN0aW9uLCBidXQgdGhp cyBpcyBhIHN5bmNocm9ub3VzIHRlc3Qgc3VpdGUuIik7CiAKICAgICAgICAgc3VwZXIuYWRkVGVz dENhc2UodGVzdGNhc2UpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzQ29udGVudFZpZXcuanMKaW5kZXgg MTkyMjY3ZTFmOWUuLmNlZTM0YmI4ZDE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNDb250ZW50Vmlldy5qcwpA QCAtNDEwLDcgKzQxMCw3IEBAIFdJLkNhbnZhc0NvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzQ29u dGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICAgICAgbGV0IGZvcm1hdFN0 cmluZyA9IGZyYW1lQ291bnQgPT09IDEgPyBXSS5VSVN0cmluZygiJWQgRnJhbWUiKSA6IFdJLlVJ U3RyaW5nKCIlZCBGcmFtZXMiKTsKICAgICAgICAgICAgIHRpdGxlID0gZm9ybWF0U3RyaW5nLmZv cm1hdChmcmFtZUNvdW50KTsKICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICB0aXRsZSA9IFdJ LlVJU3RyaW5nKCJXYWl0aW5nIGZvciBmcmFtZXPigKYiKQorICAgICAgICAgICAgdGl0bGUgPSBX SS5VSVN0cmluZygiV2FpdGluZyBmb3IgZnJhbWVz4oCmIik7CiAKICAgICAgICAgdGhpcy5fcHJv Z3Jlc3NWaWV3LnRpdGxlID0gdGl0bGU7CiAgICAgICAgIHRoaXMuX3Byb2dyZXNzVmlldy5zdWJ0 aXRsZSA9IGJ1ZmZlclVzZWQgPyBOdW1iZXIuYnl0ZXNUb1N0cmluZyhidWZmZXJVc2VkKSA6ICIi OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q29sbGVjdGlvbkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ29sbGVjdGlvbkNvbnRlbnRWaWV3LmpzCmluZGV4IGE5NzE2NTlmODg5Li4x MTBkZjcwNzRiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29sbGVjdGlvbkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbGxlY3Rpb25Db250ZW50Vmlldy5qcwpAQCAtMjc1 LDcgKzI3NSw3IEBAIFdJLkNvbGxlY3Rpb25Db250ZW50VmlldyA9IGNsYXNzIENvbGxlY3Rpb25D b250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgICAgICBpZiAodHlwZW9m IHRoaXMuX2NvbnRlbnRQbGFjZWhvbGRlciA9PT0gInN0cmluZyIpCiAgICAgICAgICAgICAgICAg dGhpcy5fY29udGVudFBsYWNlaG9sZGVyRWxlbWVudCA9IFdJLmNyZWF0ZU1lc3NhZ2VUZXh0Vmll dyh0aGlzLl9jb250ZW50UGxhY2Vob2xkZXIpOwogICAgICAgICAgICAgZWxzZSBpZiAodGhpcy5f Y29udGVudFBsYWNlaG9sZGVyIGluc3RhbmNlb2YgSFRNTEVsZW1lbnQpCi0gICAgICAgICAgICAg ICAgdGhpcy5fY29udGVudFBsYWNlaG9sZGVyRWxlbWVudCA9ICB0aGlzLl9jb250ZW50UGxhY2Vo b2xkZXI7CisgICAgICAgICAgICAgICAgdGhpcy5fY29udGVudFBsYWNlaG9sZGVyRWxlbWVudCA9 IHRoaXMuX2NvbnRlbnRQbGFjZWhvbGRlcjsKICAgICAgICAgfQogCiAgICAgICAgIGlmICghdGhp cy5fY29udGVudFBsYWNlaG9sZGVyRWxlbWVudC5wYXJlbnROb2RlKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nl ci5qcwppbmRleCAxYmZhZGFiMDQwZS4uMzVlN2I1NjUyZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2Vy LmpzCkBAIC0yMzAsNyArMjMwLDcgQEAgV0kuQ29udGVudEJyb3dzZXIgPSBjbGFzcyBDb250ZW50 QnJvd3NlciBleHRlbmRzIFdJLlZpZXcKICAgICBzaG93bigpCiAgICAgewogICAgICAgICB0aGlz Ll91cGRhdGVDb250ZW50Vmlld1NlbGVjdGlvblBhdGhOYXZpZ2F0aW9uSXRlbSh0aGlzLmN1cnJl bnRDb250ZW50Vmlldyk7Ci0gICAgICAgIHRoaXMudXBkYXRlSGllcmFyY2hpY2FsUGF0aEZvckN1 cnJlbnRDb250ZW50VmlldygpCisgICAgICAgIHRoaXMudXBkYXRlSGllcmFyY2hpY2FsUGF0aEZv ckN1cnJlbnRDb250ZW50VmlldygpOwogCiAgICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3Q29udGFp bmVyLnNob3duKCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3 LmpzCmluZGV4IDZjYjkyYTg4MWM0Li4wZjZmNjI3MTZmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tp ZVN0b3JhZ2VDb250ZW50Vmlldy5qcwpAQCAtNzMsNyArNzMsNyBAQCBXSS5Db29raWVTdG9yYWdl Q29udGVudFZpZXcgPSBjbGFzcyBDb29raWVTdG9yYWdlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5D b250ZW50VgogICAgIHsKICAgICAgICAgLy8gRklYTUUgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE1 MTQwMD46IElmIHRoZXJlIGFyZSBubyBjb29raWVzLCBhZGQgcGxhY2Vob2xkZXIgZXhwbGFuYXRv cnkgdGV4dC4KICAgICAgICAgaWYgKCF0aGlzLl9kYXRhR3JpZCkgewotICAgICAgICAgICAgdmFy IGNvbHVtbnMgPSB7bmFtZToge30sIHZhbHVlOiB7fSwgZG9tYWluOiB7fSwgcGF0aDoge30sIGV4 cGlyZXM6IHt9LCBzaXplOiB7fSwgaHR0cDoge30sIHNlY3VyZToge30sIHNhbWVTaXRlOiB7fSB9 OworICAgICAgICAgICAgdmFyIGNvbHVtbnMgPSB7bmFtZToge30sIHZhbHVlOiB7fSwgZG9tYWlu OiB7fSwgcGF0aDoge30sIGV4cGlyZXM6IHt9LCBzaXplOiB7fSwgaHR0cDoge30sIHNlY3VyZTog e30sIHNhbWVTaXRlOiB7fX07CiAKICAgICAgICAgICAgIGNvbHVtbnMubmFtZS50aXRsZSA9IFdJ LlVJU3RyaW5nKCJOYW1lIik7CiAgICAgICAgICAgICBjb2x1bW5zLm5hbWUuc29ydGFibGUgPSB0 cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9EYXRhR3JpZC5qcwppbmRleCBlMjUzMGY1NTEyYi4uMmU2NDIxYzFlZGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpz CkBAIC0xNTczLDcgKzE1NzMsNiBAQCBXSS5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVu ZHMgV0kuVmlldwogICAgICAgICBpZiAoIWdyaWROb2RlKSB7CiAgICAgICAgICAgICBpZiAodGhp cy5zZWxlY3RlZE5vZGUpCiAgICAgICAgICAgICAgICAgdGhpcy5zZWxlY3RlZE5vZGUuZGVzZWxl Y3QoKTsKLSAgICAgICAgICAgIAogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFi YXNlVGFibGVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RhdGFiYXNlVGFibGVDb250ZW50Vmlldy5qcwppbmRleCA5MDM3ZjZhNTg3ZS4u Y2IyYjRjOWMxYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RhdGFiYXNlVGFibGVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhYmFzZVRhYmxlQ29udGVudFZpZXcuanMK QEAgLTY5LDcgKzY5LDcgQEAgV0kuRGF0YWJhc2VUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgRGF0 YWJhc2VUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFYKIAogICAgIF9lc2NhcGVU YWJsZU5hbWUobmFtZSkKICAgICB7Ci0gICAgICAgIHJldHVybiBuYW1lLnJlcGxhY2UoL1wiL2cs ICJcIlwiIik7CisgICAgICAgIHJldHVybiBuYW1lLnJlcGxhY2UoLyIvZywgIlwiXCIiKTsKICAg ICB9CiAKICAgICBfcXVlcnlGaW5pc2hlZChjb2x1bW5OYW1lcywgdmFsdWVzKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIu anMKaW5kZXggYjY5ODFjZjQyYjYuLmRjOTJjNzAxYWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuanMKQEAgLTUz LDcgKzUzLDcgQEAgV0kuRmluZEJhbm5lciA9IGNsYXNzIEZpbmRCYW5uZXIgZXh0ZW5kcyBXSS5O YXZpZ2F0aW9uSXRlbQogICAgICAgICB0aGlzLl9wcmV2aW91c1Jlc3VsdEJ1dHRvbiA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoImJ1dHRvbiIpOwogICAgICAgICB0aGlzLl9wcmV2aW91c1Jlc3Vs dEJ1dHRvbi5jbGFzc0xpc3QuYWRkKCJzZWdtZW50ZWQiLCAicHJldmlvdXMtcmVzdWx0Iik7CiAg ICAgICAgIHRoaXMuX3ByZXZpb3VzUmVzdWx0QnV0dG9uLmRpc2FibGVkID0gdHJ1ZTsKLSAgICAg ICAgdGhpcy5fcHJldmlvdXNSZXN1bHRCdXR0b24udGl0bGUgPSBXSS5VSVN0cmluZygiRmluZCBQ cmV2aW91cyAoJXMpIikuZm9ybWF0KFdJLmZpbmRQcmV2aW91c0tleWJvYXJkU2hvcnRjdXQuZGlz cGxheU5hbWUpOzsKKyAgICAgICAgdGhpcy5fcHJldmlvdXNSZXN1bHRCdXR0b24udGl0bGUgPSBX SS5VSVN0cmluZygiRmluZCBQcmV2aW91cyAoJXMpIikuZm9ybWF0KFdJLmZpbmRQcmV2aW91c0tl eWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpOwogICAgICAgICB0aGlzLl9wcmV2aW91c1Jlc3Vs dEJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3ByZXZpb3VzUmVzdWx0QnV0 dG9uQ2xpY2tlZC5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuX3ByZXZpb3VzUmVzdWx0QnV0dG9uKTsKIApAQCAtNjQsNyArNjQsNyBAQCBXSS5GaW5k QmFubmVyID0gY2xhc3MgRmluZEJhbm5lciBleHRlbmRzIFdJLk5hdmlnYXRpb25JdGVtCiAgICAg ICAgIHRoaXMuX25leHRSZXN1bHRCdXR0b24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJidXR0 b24iKTsKICAgICAgICAgdGhpcy5fbmV4dFJlc3VsdEJ1dHRvbi5jbGFzc0xpc3QuYWRkKCJzZWdt ZW50ZWQiLCAibmV4dC1yZXN1bHQiKTsKICAgICAgICAgdGhpcy5fbmV4dFJlc3VsdEJ1dHRvbi5k aXNhYmxlZCA9IHRydWU7Ci0gICAgICAgIHRoaXMuX25leHRSZXN1bHRCdXR0b24udGl0bGUgPSBX SS5VSVN0cmluZygiRmluZCBOZXh0ICglcykiKS5mb3JtYXQoV0kuZmluZE5leHRLZXlib2FyZFNo b3J0Y3V0LmRpc3BsYXlOYW1lKTs7CisgICAgICAgIHRoaXMuX25leHRSZXN1bHRCdXR0b24udGl0 bGUgPSBXSS5VSVN0cmluZygiRmluZCBOZXh0ICglcykiKS5mb3JtYXQoV0kuZmluZE5leHRLZXli b2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lKTsKICAgICAgICAgdGhpcy5fbmV4dFJlc3VsdEJ1dHRv bi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX25leHRSZXN1bHRCdXR0b25DbGlja2Vk LmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbmV4 dFJlc3VsdEJ1dHRvbik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0pTT05SZXNvdXJjZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSlNPTlJlc291cmNlQ29udGVudFZpZXcuanMK aW5kZXggMWJkZDQ5Y2Q4MGQuLmE3ODg0NWM1ZDc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9KU09OUmVzb3VyY2VDb250ZW50Vmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9KU09OUmVzb3Vy Y2VDb250ZW50Vmlldy5qcwpAQCAtNTYsNyArNTYsNyBAQCBXSS5KU09OUmVzb3VyY2VDb250ZW50 VmlldyA9IGNsYXNzIEpTT05SZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuUmVzb3VyY2VD bwogICAgICAgICAgICAgZG9Ob3RQYXVzZU9uRXhjZXB0aW9uc0FuZE11dGVDb25zb2xlOiB0cnVl LAogICAgICAgICAgICAgY29udGV4dElkOiB1bmRlZmluZWQsCiAgICAgICAgICAgICByZXR1cm5C eVZhbHVlOiBmYWxzZSwKLSAgICAgICAgICAgIGdlbmVyYXRlUHJldmlldzogdHJ1ZSwgICAgCisg ICAgICAgICAgICBnZW5lcmF0ZVByZXZpZXc6IHRydWUsCiAgICAgICAgIH07CiAgICAgICAgIHRo aXMucmVzb3VyY2UudGFyZ2V0LlJ1bnRpbWVBZ2VudC5ldmFsdWF0ZS5pbnZva2Uob3B0aW9ucywg KGVycm9yLCByZXN1bHQsIHdhc1Rocm93bikgPT4gewogICAgICAgICAgICAgaWYgKGVycm9yIHx8 IHdhc1Rocm93bikgewpAQCAtODAsNiArODAsNiBAQCBXSS5KU09OUmVzb3VyY2VDb250ZW50Vmll dyA9IGNsYXNzIEpTT05SZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuUmVzb3VyY2VDbwog ICAgICAgICBpZiAodGhpcy5fcmVtb3RlT2JqZWN0KSB7CiAgICAgICAgICAgICB0aGlzLl9yZW1v dGVPYmplY3QucmVsZWFzZSgpOwogICAgICAgICAgICAgdGhpcy5fcmVtb3RlT2JqZWN0ID0gbnVs bDsKLSAgICAgICAgfSAgIAorICAgICAgICB9CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcu anMKaW5kZXggM2M4NmY5ZWUzNTMuLjNkOTc4NzU1ZjYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5q cwpAQCAtNzksNyArNzksNyBAQCBXSS5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRW aWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0 ZW0oV0kuTG9nQ29udGVudFZpZXcuU2NvcGVzLldhcm5pbmdzLCBXSS5VSVN0cmluZygiV2Fybmlu Z3MiKSwgZmFsc2UsICJ3YXJuaW5ncyIpLAogICAgICAgICAgICAgbmV3IFdJLlNjb3BlQmFySXRl bShXSS5Mb2dDb250ZW50Vmlldy5TY29wZXMuTG9ncywgV0kuVUlTdHJpbmcoIkxvZ3MiKSwgZmFs c2UsICJsb2dzIiksCiAgICAgICAgICAgICBuZXcgV0kuU2NvcGVCYXJJdGVtKFdJLkxvZ0NvbnRl bnRWaWV3LlNjb3Blcy5JbmZvcywgV0kuVUlTdHJpbmcoIkluZm9zIiksIGZhbHNlLCAiaW5mb3Mi LCB0cnVlKSwKLSAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVudFZp ZXcuU2NvcGVzLkRlYnVncywgV0kuVUlTdHJpbmcoIkRlYnVncyIpLCBmYWxzZSwgImRlYnVncyIs IHRydWUpLCAgICAgICAgICAgIAorICAgICAgICAgICAgbmV3IFdJLlNjb3BlQmFySXRlbShXSS5M b2dDb250ZW50Vmlldy5TY29wZXMuRGVidWdzLCBXSS5VSVN0cmluZygiRGVidWdzIiksIGZhbHNl LCAiZGVidWdzIiwgdHJ1ZSksCiAgICAgICAgIF07CiAKICAgICAgICAgdGhpcy5fc2NvcGVCYXIg PSBuZXcgV0kuU2NvcGVCYXIoImxvZy1zY29wZS1iYXIiLCBzY29wZUJhckl0ZW1zLCBzY29wZUJh ckl0ZW1zWzBdKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanMKaW5kZXggNTQyNGVl ZmFiNjUuLjJmNzZiNmNmZWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcwpA QCAtMzE3LDcgKzMxNyw3IEBAIFdJLlJlc291cmNlU2lkZWJhclBhbmVsID0gY2xhc3MgUmVzb3Vy Y2VTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhCiAgICAgICAgICAgICAg ICAgICAgIHRoaXMuX2FkZFRhcmdldFdpdGhNYWluUmVzb3VyY2Uoc2NyaXB0LnRhcmdldCk7CiAg ICAgICAgICAgICAgICAgdGhpcy5jb250ZW50VHJlZU91dGxpbmUuZGlzY2xvc3VyZUJ1dHRvbnMg PSB0cnVlOwogICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0gICAgICAgICAg ICAKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIC8vIElmIHRoZSBzY3JpcHQg VVJMIG1hdGNoZXMgYSByZXNvdXJjZSB3ZSBjYW4gYXNzdW1lIGl0IGlzIHBhcnQgb2YgdGhhdCBy ZXNvdXJjZSBhbmQgZG9lcyBub3QgbmVlZCBhZGRlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRF ZGl0b3IuanMKaW5kZXggODNkMGZmMWI1OTAuLjEyZTVkZTJkNTExIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRv ci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3Vy Y2VDb2RlVGV4dEVkaXRvci5qcwpAQCAtMTQzMiw3ICsxNDMyLDcgQEAgV0kuU291cmNlQ29kZVRl eHRFZGl0b3IgPSBjbGFzcyBTb3VyY2VDb2RlVGV4dEVkaXRvciBleHRlbmRzIFdJLlRleHRFZGl0 b3IKICAgICAgICAgICAgIHN0YXJ0UG9zaXRpb24gPSBmcm9tSW5saW5lU2NyaXB0UG9zaXRpb24o c3RhcnRQb3NpdGlvbikudG9Db2RlTWlycm9yKCk7CiAgICAgICAgICAgICBlbmRQb3NpdGlvbiA9 IGZyb21JbmxpbmVTY3JpcHRQb3NpdGlvbihlbmRQb3NpdGlvbikudG9Db2RlTWlycm9yKCk7CiAg ICAgICAgICAgICBjYWxsYmFjayh7c3RhcnRQb3NpdGlvbiwgZW5kUG9zaXRpb259KTsKLSAgICAg ICAgfQorICAgICAgICB9OwogCiAgICAgICAgIHNjcmlwdC5yZXF1ZXN0U2NyaXB0U3ludGF4VHJl ZSgoc3ludGF4VHJlZSkgPT4gewogICAgICAgICAgICAgLy8gQ29udmVydCB0byB0aGUgcG9zaXRp b24gd2l0aGluIHRoZSBpbmxpbmUgc2NyaXB0IGJlZm9yZSBxdWVyeWluZyB0aGUgQVNULgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFk c2hlZXRUZXh0RmllbGQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qcwppbmRleCAxNjUxMmY2MjkzYy4uZmEwYWNkZDk4 MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NwcmVhZHNoZWV0VGV4dEZpZWxkLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0VGV4dEZpZWxkLmpzCkBAIC0zOTYsNyArMzk2LDcg QEAgV0kuU3ByZWFkc2hlZXRUZXh0RmllbGQgPSBjbGFzcyBTcHJlYWRzaGVldFRleHRGaWVsZAog ICAgICAgICBsZXQgc2VsZWN0aW9uID0gd2luZG93LmdldFNlbGVjdGlvbigpOwogCiAgICAgICAg IGxldCBpc0hpZGRlbiA9IChjbGllbnRSZWN0KSA9PiB7Ci0gICAgICAgICAgICByZXR1cm4gY2xp ZW50UmVjdC54ID09PSAwICYmIGNsaWVudFJlY3QueSA9PT0gMAorICAgICAgICAgICAgcmV0dXJu IGNsaWVudFJlY3QueCA9PT0gMCAmJiBjbGllbnRSZWN0LnkgPT09IDA7CiAgICAgICAgIH07CiAK ICAgICAgICAgaWYgKHNlbGVjdGlvbi5yYW5nZUNvdW50KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Xb3JrZXJzL0Zvcm1hdHRlci9Gb3JtYXR0ZXJV dGlsaXRpZXMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Xb3JrZXJz L0Zvcm1hdHRlci9Gb3JtYXR0ZXJVdGlsaXRpZXMuanMKaW5kZXggOGE4OTQ2Y2E0ZTIuLjRiMjgx Mjg5YjUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9X b3JrZXJzL0Zvcm1hdHRlci9Gb3JtYXR0ZXJVdGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvV29ya2Vycy9Gb3JtYXR0ZXIvRm9ybWF0dGVyVXRpbGl0 aWVzLmpzCkBAIC00Miw3ICs0Miw3IEBAIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShTdHJpbmcucHJv dG90eXBlLCAibGluZUVuZGluZ3MiLAogICAgICAgICBsZXQgbWF0Y2ggPSBwYXR0ZXJuLmV4ZWMo dGhpcyk7CiAgICAgICAgIHdoaWxlIChtYXRjaCkgewogICAgICAgICAgICAgbGluZUVuZGluZ3Mu cHVzaChtYXRjaC5pbmRleCk7Ci0gICAgICAgICAgICBtYXRjaCA9IHBhdHRlcm4uZXhlYyh0aGlz KQorICAgICAgICAgICAgbWF0Y2ggPSBwYXR0ZXJuLmV4ZWModGhpcyk7CiAgICAgICAgIH0KIAog ICAgICAgICBsaW5lRW5kaW5ncy5wdXNoKHRoaXMubGVuZ3RoKTsK