173986 2017-06-29 12:54:22 -0700 Web Inspector: Remove unnecessary hasChildren from TreeOutline 2017-07-06 17:00:19 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED WONTFIX https://bugs.webkit.org/show_bug.cgi?id=173807 P2 Normal --- 174042 1 hi hi buildbot commit-queue ggaren inspector-bugzilla-changes joepeck oldest_to_newest 1324059 0 hi 2017-06-29 12:54:22 -0700 . 1324105 1 314170 hi 2017-06-29 14:37:09 -0700 Created attachment 314170 Patch 1324107 2 buildbot 2017-06-29 14:38:16 -0700 Attachment 314170 did not pass style-queue: ERROR: Source/WebInspectorUI/ChangeLog:3: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1324108 3 314172 hi 2017-06-29 14:39:10 -0700 Created attachment 314172 Patch Oops. Forgot bug :P 1324109 4 314173 hi 2017-06-29 14:39:35 -0700 Created attachment 314173 Patch Oops. Forgot bug :P 1324127 5 314180 hi 2017-06-29 16:02:53 -0700 Created attachment 314180 Patch 1324182 6 314180 joepeck 2017-06-29 17:21:44 -0700 Comment on attachment 314180 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314180&action=review > Source/WebInspectorUI/ChangeLog:24 > +2017-06-29 Devin Rousso <drousso@apple.com> > + > + Web Inspector: TreeOutlines should mark hasChildren as false when calling removeChildren > + https://bugs.webkit.org/show_bug.cgi?id=173986 Double changelog. Seems fine. r=me 1324224 7 314205 hi 2017-06-29 18:48:50 -0700 Created attachment 314205 Patch 1324234 8 314205 commit-queue 2017-06-29 19:16:09 -0700 Comment on attachment 314205 Patch Clearing flags on attachment: 314205 Committed r218983: <http://trac.webkit.org/changeset/218983> 1324235 9 commit-queue 2017-06-29 19:16:10 -0700 All reviewed patches have been landed. Closing bug. 1324543 10 commit-queue 2017-06-30 14:44:52 -0700 Re-opened since this is blocked by bug 174042 1324555 11 joepeck 2017-06-30 14:51:04 -0700 This transitively affected TreeElement, because some TreeElement operations were TreeOutline operations: appendChild() { return WebInspector.TreeOutline.prototype.appendChild.apply(this, arguments); } insertChild() { return WebInspector.TreeOutline.prototype.insertChild.apply(this, arguments); } removeChild() { return WebInspector.TreeOutline.prototype.removeChild.apply(this, arguments); } removeChildAtIndex() { return WebInspector.TreeOutline.prototype.removeChildAtIndex.apply(this, arguments); } removeChildren() { return WebInspector.TreeOutline.prototype.removeChildren.apply(this, arguments); } removeChildrenRecursive() { return WebInspector.TreeOutline.prototype.removeChildrenRecursive.apply(this, arguments); } selfOrDescendant() { return WebInspector.TreeOutline.prototype.selfOrDescendant.apply(this, arguments); } So this was not the right change. It is being rolled out. Ultimately the underlying issue "TreeOutline's hasChildren doesn't match children.length" still exists. The "hasChildren" property is misleading. It may mean "Doesn't have children yet but needs to populate and will have children", so it is unclear. Lets leave this the way it is and correct any individual issues as needed. 1326257 12 ggaren 2017-07-06 17:00:19 -0700 Seems like a good idea to add a test case for the backtraces we temporarily broke. That's a pretty significant regression not to catch by automated testing. 314170 2017-06-29 14:37:09 -0700 2017-06-29 14:39:10 -0700 Patch 173986.diff text/plain 2212 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlZGMzZDdkNzFjLi4wYmFlODhkZWU2MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTctMDYtMjkgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIE5lZWQgYSBzaG9ydCBkZXNj cmlwdGlvbiAoT09QUyEpLgorICAgICAgICBOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRyZWVPdXRs aW5lLnByb3RvdHlwZS5yZW1vdmVDaGlsZEF0SW5kZXgpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRyZWVPdXRsaW5lLnByb3RvdHlwZS5yZW1vdmVDaGlsZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVHJlZU91dGxpbmUucHJvdG90eXBlLnJlbW92ZUNoaWxkcmVuKToKKwogMjAxNy0wNi0yOCAg RGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogSW5zdHJ1bWVudCBhY3RpdmUgcGl4ZWwgbWVtb3J5IHVzZWQgYnkgY2FudmFzZXMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRs aW5lLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91 dGxpbmUuanMKaW5kZXggOWU2ODI3NWYxYzIuLmQ5NWVmNGNiYTZhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5q cwpAQCAtMjY3LDYgKzI2NywxMiBAQCBXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUgPSBjbGFzcyBU cmVlT3V0bGluZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgY2hpbGQubmV4 dFNpYmxpbmcgPSBudWxsOwogICAgICAgICBjaGlsZC5wcmV2aW91c1NpYmxpbmcgPSBudWxsOwog CisgICAgICAgIGlmICghdGhpcy5jaGlsZHJlbi5sZW5ndGgpIHsKKyAgICAgICAgICAgIGlmICh0 aGlzLl9saXN0SXRlbU5vZGUpCisgICAgICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmNs YXNzTGlzdC5yZW1vdmUoInBhcmVudCIpOworICAgICAgICAgICAgdGhpcy5oYXNDaGlsZHJlbiA9 IGZhbHNlOworICAgICAgICB9CisKICAgICAgICAgaWYgKHRyZWVPdXRsaW5lKQogICAgICAgICAg ICAgdHJlZU91dGxpbmUuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UcmVl T3V0bGluZS5FdmVudC5FbGVtZW50UmVtb3ZlZCwge2VsZW1lbnQ6IGNoaWxkfSk7CiAgICAgfQpA QCAtMjgzLDEyICsyODksNiBAQCBXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVl T3V0bGluZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgICAgIHJldHVybjsK IAogICAgICAgICB0aGlzLnJlbW92ZUNoaWxkQXRJbmRleChjaGlsZEluZGV4LCBzdXBwcmVzc09u RGVzZWxlY3QsIHN1cHByZXNzU2VsZWN0U2libGluZyk7Ci0KLSAgICAgICAgaWYgKCF0aGlzLmNo aWxkcmVuLmxlbmd0aCkgewotICAgICAgICAgICAgaWYgKHRoaXMuX2xpc3RJdGVtTm9kZSkKLSAg ICAgICAgICAgICAgICB0aGlzLl9saXN0SXRlbU5vZGUuY2xhc3NMaXN0LnJlbW92ZSgicGFyZW50 Iik7Ci0gICAgICAgICAgICB0aGlzLmhhc0NoaWxkcmVuID0gZmFsc2U7Ci0gICAgICAgIH0KICAg ICB9CiAKICAgICByZW1vdmVDaGlsZHJlbihzdXBwcmVzc09uRGVzZWxlY3QpCkBAIC0zMTMsNiAr MzEzLDcgQEAgV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLmNoaWxk cmVuID0gW107CisgICAgICAgIHRoaXMuaGFzQ2hpbGRyZW4gPSBmYWxzZTsKICAgICB9CiAKICAg ICByZW1vdmVDaGlsZHJlblJlY3Vyc2l2ZShzdXBwcmVzc09uRGVzZWxlY3QpCg== 314172 2017-06-29 14:39:10 -0700 2017-06-29 14:39:35 -0700 Patch 173986.diff text/plain 2288 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlZGMzZDdkNzFjLi4wYmFlODhkZWU2MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTctMDYtMjkgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFRy ZWVPdXRsaW5lcyBzaG91bGQgbWFyayBoYXNDaGlsZHJlbiBhcyBmYWxzZSB3aGVuIGNhbGxpbmcg cmVtb3ZlQ2hpbGRyZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3Mzk4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UcmVlT3V0bGluZS5wcm90b3R5cGUucmVtb3ZlQ2hpbGRBdEluZGV4KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5wcm90b3R5cGUucmVtb3ZlQ2hpbGQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lLnByb3RvdHlwZS5yZW1vdmVDaGlsZHJl bik6CisKIDIwMTctMDYtMjggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IEluc3RydW1lbnQgYWN0aXZlIHBpeGVsIG1lbW9yeSB1c2Vk IGJ5IGNhbnZhc2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCmluZGV4IDllNjgyNzVmMWMyLi5kOTVlZjRjYmE2 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VHJlZU91dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVHJlZU91dGxpbmUuanMKQEAgLTI2Nyw2ICsyNjcsMTIgQEAgV2ViSW5zcGVjdG9yLlRy ZWVPdXRsaW5lID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0 CiAgICAgICAgIGNoaWxkLm5leHRTaWJsaW5nID0gbnVsbDsKICAgICAgICAgY2hpbGQucHJldmlv dXNTaWJsaW5nID0gbnVsbDsKIAorICAgICAgICBpZiAoIXRoaXMuY2hpbGRyZW4ubGVuZ3RoKSB7 CisgICAgICAgICAgICBpZiAodGhpcy5fbGlzdEl0ZW1Ob2RlKQorICAgICAgICAgICAgICAgIHRo aXMuX2xpc3RJdGVtTm9kZS5jbGFzc0xpc3QucmVtb3ZlKCJwYXJlbnQiKTsKKyAgICAgICAgICAg IHRoaXMuaGFzQ2hpbGRyZW4gPSBmYWxzZTsKKyAgICAgICAgfQorCiAgICAgICAgIGlmICh0cmVl T3V0bGluZSkKICAgICAgICAgICAgIHRyZWVPdXRsaW5lLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUuRXZlbnQuRWxlbWVudFJlbW92ZWQsIHtlbGVtZW50 OiBjaGlsZH0pOwogICAgIH0KQEAgLTI4MywxMiArMjg5LDYgQEAgV2ViSW5zcGVjdG9yLlRyZWVP dXRsaW5lID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAg ICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5yZW1vdmVDaGlsZEF0SW5kZXgoY2hp bGRJbmRleCwgc3VwcHJlc3NPbkRlc2VsZWN0LCBzdXBwcmVzc1NlbGVjdFNpYmxpbmcpOwotCi0g ICAgICAgIGlmICghdGhpcy5jaGlsZHJlbi5sZW5ndGgpIHsKLSAgICAgICAgICAgIGlmICh0aGlz Ll9saXN0SXRlbU5vZGUpCi0gICAgICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmNsYXNz TGlzdC5yZW1vdmUoInBhcmVudCIpOwotICAgICAgICAgICAgdGhpcy5oYXNDaGlsZHJlbiA9IGZh bHNlOwotICAgICAgICB9CiAgICAgfQogCiAgICAgcmVtb3ZlQ2hpbGRyZW4oc3VwcHJlc3NPbkRl c2VsZWN0KQpAQCAtMzEzLDYgKzMxMyw3IEBAIFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZSA9IGNs YXNzIFRyZWVPdXRsaW5lIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB9CiAK ICAgICAgICAgdGhpcy5jaGlsZHJlbiA9IFtdOworICAgICAgICB0aGlzLmhhc0NoaWxkcmVuID0g ZmFsc2U7CiAgICAgfQogCiAgICAgcmVtb3ZlQ2hpbGRyZW5SZWN1cnNpdmUoc3VwcHJlc3NPbkRl c2VsZWN0KQo= 314173 2017-06-29 14:39:35 -0700 2017-06-29 16:02:53 -0700 Patch 173986.diff text/plain 2288 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlZGMzZDdkNzFjLi4wYmFlODhkZWU2MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTctMDYtMjkgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFRy ZWVPdXRsaW5lcyBzaG91bGQgbWFyayBoYXNDaGlsZHJlbiBhcyBmYWxzZSB3aGVuIGNhbGxpbmcg cmVtb3ZlQ2hpbGRyZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3Mzk4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UcmVlT3V0bGluZS5wcm90b3R5cGUucmVtb3ZlQ2hpbGRBdEluZGV4KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5wcm90b3R5cGUucmVtb3ZlQ2hpbGQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lLnByb3RvdHlwZS5yZW1vdmVDaGlsZHJl bik6CisKIDIwMTctMDYtMjggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IEluc3RydW1lbnQgYWN0aXZlIHBpeGVsIG1lbW9yeSB1c2Vk IGJ5IGNhbnZhc2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCmluZGV4IDllNjgyNzVmMWMyLi5kOTVlZjRjYmE2 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VHJlZU91dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVHJlZU91dGxpbmUuanMKQEAgLTI2Nyw2ICsyNjcsMTIgQEAgV2ViSW5zcGVjdG9yLlRy ZWVPdXRsaW5lID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0 CiAgICAgICAgIGNoaWxkLm5leHRTaWJsaW5nID0gbnVsbDsKICAgICAgICAgY2hpbGQucHJldmlv dXNTaWJsaW5nID0gbnVsbDsKIAorICAgICAgICBpZiAoIXRoaXMuY2hpbGRyZW4ubGVuZ3RoKSB7 CisgICAgICAgICAgICBpZiAodGhpcy5fbGlzdEl0ZW1Ob2RlKQorICAgICAgICAgICAgICAgIHRo aXMuX2xpc3RJdGVtTm9kZS5jbGFzc0xpc3QucmVtb3ZlKCJwYXJlbnQiKTsKKyAgICAgICAgICAg IHRoaXMuaGFzQ2hpbGRyZW4gPSBmYWxzZTsKKyAgICAgICAgfQorCiAgICAgICAgIGlmICh0cmVl T3V0bGluZSkKICAgICAgICAgICAgIHRyZWVPdXRsaW5lLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUuRXZlbnQuRWxlbWVudFJlbW92ZWQsIHtlbGVtZW50 OiBjaGlsZH0pOwogICAgIH0KQEAgLTI4MywxMiArMjg5LDYgQEAgV2ViSW5zcGVjdG9yLlRyZWVP dXRsaW5lID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAg ICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5yZW1vdmVDaGlsZEF0SW5kZXgoY2hp bGRJbmRleCwgc3VwcHJlc3NPbkRlc2VsZWN0LCBzdXBwcmVzc1NlbGVjdFNpYmxpbmcpOwotCi0g ICAgICAgIGlmICghdGhpcy5jaGlsZHJlbi5sZW5ndGgpIHsKLSAgICAgICAgICAgIGlmICh0aGlz Ll9saXN0SXRlbU5vZGUpCi0gICAgICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmNsYXNz TGlzdC5yZW1vdmUoInBhcmVudCIpOwotICAgICAgICAgICAgdGhpcy5oYXNDaGlsZHJlbiA9IGZh bHNlOwotICAgICAgICB9CiAgICAgfQogCiAgICAgcmVtb3ZlQ2hpbGRyZW4oc3VwcHJlc3NPbkRl c2VsZWN0KQpAQCAtMzEzLDYgKzMxMyw3IEBAIFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZSA9IGNs YXNzIFRyZWVPdXRsaW5lIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB9CiAK ICAgICAgICAgdGhpcy5jaGlsZHJlbiA9IFtdOworICAgICAgICB0aGlzLmhhc0NoaWxkcmVuID0g ZmFsc2U7CiAgICAgfQogCiAgICAgcmVtb3ZlQ2hpbGRyZW5SZWN1cnNpdmUoc3VwcHJlc3NPbkRl c2VsZWN0KQo= 314180 2017-06-29 16:02:53 -0700 2017-06-29 18:48:50 -0700 Patch 173986.diff text/plain 5945 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlZGMzZDdkNzFjLi45NzQ1ZTA3MTJmMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTctMDYtMjkgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJl bW92ZSB1bm5lY2Vzc2FyeSBoYXNDaGlsZHJlbiBmcm9tIFRyZWVPdXRsaW5lCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM5ODYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvVHJlZU91dGxpbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lLnByb3RvdHlwZS5hcHBlbmRDaGlsZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUucHJvdG90eXBlLmluc2VydENoaWxk KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5wcm90b3R5cGUucmVtb3ZlQ2hp bGRBdEluZGV4KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5wcm90b3R5cGUu cmVtb3ZlQ2hpbGQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lLnByb3RvdHlw ZS5nZXQgc2VsZWN0ZWRUcmVlRWxlbWVudEluZGV4KToKKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fY2hlY2tPdXRsaW5lc0ZvclBlbmRp bmdWaWV3U3RhdGVDb29raWUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFs U3R5bGVDb21tYVNlcGFyYXRlZEtleXdvcmRFZGl0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVmlzdWFsU3R5bGVDb21tYVNlcGFyYXRlZEtleXdvcmRFZGl0b3IucHJvdG90eXBlLmdldCB2 YWx1ZSk6CisKKzIwMTctMDYtMjkgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgor CisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFRyZWVPdXRsaW5lcyBzaG91bGQgbWFyayBoYXNDaGls ZHJlbiBhcyBmYWxzZSB3aGVuIGNhbGxpbmcgcmVtb3ZlQ2hpbGRyZW4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3Mzk4NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9U cmVlT3V0bGluZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5wcm90b3R5 cGUucmVtb3ZlQ2hpbGRBdEluZGV4KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UcmVlT3V0bGlu ZS5wcm90b3R5cGUucmVtb3ZlQ2hpbGQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRyZWVPdXRs aW5lLnByb3RvdHlwZS5yZW1vdmVDaGlsZHJlbik6CisKIDIwMTctMDYtMjggIERldmluIFJvdXNz byAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEluc3RydW1l bnQgYWN0aXZlIHBpeGVsIG1lbW9yeSB1c2VkIGJ5IGNhbnZhc2VzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBh bmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdh dGlvblNpZGViYXJQYW5lbC5qcwppbmRleCA5NTAzMWMzZWFlMC4uYzkzYmUyMjcxYjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRp b25TaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwpAQCAtNjUyLDcgKzY1Miw3IEBAIFdl Ykluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgTmF2aWdhdGlvblNpZGVi YXJQYW5lbCBleHRlbmRzIFdlYkluCiAKICAgICAgICAgdmFyIHZpc2libGVUcmVlRWxlbWVudHMg PSBbXTsKICAgICAgICAgdGhpcy5jb250ZW50VHJlZU91dGxpbmVzLmZvckVhY2goZnVuY3Rpb24o b3V0bGluZSkgewotICAgICAgICAgICAgdmFyIGN1cnJlbnRUcmVlRWxlbWVudCA9IG91dGxpbmUu aGFzQ2hpbGRyZW4gPyBvdXRsaW5lLmNoaWxkcmVuWzBdIDogbnVsbDsKKyAgICAgICAgICAgIHZh ciBjdXJyZW50VHJlZUVsZW1lbnQgPSBvdXRsaW5lLmNoaWxkcmVuLmxlbmd0aCA/IG91dGxpbmUu Y2hpbGRyZW5bMF0gOiBudWxsOwogICAgICAgICAgICAgd2hpbGUgKGN1cnJlbnRUcmVlRWxlbWVu dCkgewogICAgICAgICAgICAgICAgIHZpc2libGVUcmVlRWxlbWVudHMucHVzaChjdXJyZW50VHJl ZUVsZW1lbnQpOwogICAgICAgICAgICAgICAgIGN1cnJlbnRUcmVlRWxlbWVudCA9IGN1cnJlbnRU cmVlRWxlbWVudC50cmF2ZXJzZU5leHRUcmVlRWxlbWVudChmYWxzZSwgbnVsbCwgZmFsc2UpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJl ZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U cmVlT3V0bGluZS5qcwppbmRleCA5ZTY4Mjc1ZjFjMi4uOGE2YmU0ZDA1NzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRs aW5lLmpzCkBAIC00NCw3ICs0NCw2IEBAIFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZSA9IGNsYXNz IFRyZWVPdXRsaW5lIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB0aGlzLl90 cmVlRWxlbWVudHNFeHBhbmRlZFN0YXRlID0gW107CiAgICAgICAgIHRoaXMuYWxsb3dzUmVwZWF0 U2VsZWN0aW9uID0gZmFsc2U7CiAgICAgICAgIHRoaXMucm9vdCA9IHRydWU7Ci0gICAgICAgIHRo aXMuaGFzQ2hpbGRyZW4gPSBmYWxzZTsKICAgICAgICAgdGhpcy5leHBhbmRlZCA9IHRydWU7CiAg ICAgICAgIHRoaXMuc2VsZWN0ZWQgPSBmYWxzZTsKICAgICAgICAgdGhpcy50cmVlT3V0bGluZSA9 IHRoaXM7CkBAIC0xNTYsNyArMTU1LDYgQEAgV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lID0gY2xh c3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIHZhciBp c0ZpcnN0Q2hpbGQgPSAhdGhpcy5jaGlsZHJlbi5sZW5ndGg7CiAKICAgICAgICAgdGhpcy5jaGls ZHJlbi5wdXNoKGNoaWxkKTsKLSAgICAgICAgdGhpcy5oYXNDaGlsZHJlbiA9IHRydWU7CiAgICAg ICAgIGNoaWxkLnBhcmVudCA9IHRoaXM7CiAgICAgICAgIGNoaWxkLnRyZWVPdXRsaW5lID0gdGhp cy50cmVlT3V0bGluZTsKICAgICAgICAgY2hpbGQudHJlZU91dGxpbmUuX3JlbWVtYmVyVHJlZUVs ZW1lbnQoY2hpbGQpOwpAQCAtMjA2LDcgKzIwNCw2IEBAIFdlYkluc3BlY3Rvci5UcmVlT3V0bGlu ZSA9IGNsYXNzIFRyZWVPdXRsaW5lIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAg ICB2YXIgaXNGaXJzdENoaWxkID0gIXRoaXMuY2hpbGRyZW4ubGVuZ3RoOwogCiAgICAgICAgIHRo aXMuY2hpbGRyZW4uc3BsaWNlKGluZGV4LCAwLCBjaGlsZCk7Ci0gICAgICAgIHRoaXMuaGFzQ2hp bGRyZW4gPSB0cnVlOwogICAgICAgICBjaGlsZC5wYXJlbnQgPSB0aGlzOwogICAgICAgICBjaGls ZC50cmVlT3V0bGluZSA9IHRoaXMudHJlZU91dGxpbmU7CiAgICAgICAgIGNoaWxkLnRyZWVPdXRs aW5lLl9yZW1lbWJlclRyZWVFbGVtZW50KGNoaWxkKTsKQEAgLTI2Nyw2ICsyNjQsOSBAQCBXZWJJ bnNwZWN0b3IuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdlYkluc3Bl Y3Rvci5PYmplY3QKICAgICAgICAgY2hpbGQubmV4dFNpYmxpbmcgPSBudWxsOwogICAgICAgICBj aGlsZC5wcmV2aW91c1NpYmxpbmcgPSBudWxsOwogCisgICAgICAgIGlmICghdGhpcy5jaGlsZHJl bi5sZW5ndGggJiYgdGhpcy5fbGlzdEl0ZW1Ob2RlKQorICAgICAgICAgICAgdGhpcy5fbGlzdEl0 ZW1Ob2RlLmNsYXNzTGlzdC5yZW1vdmUoInBhcmVudCIpOworCiAgICAgICAgIGlmICh0cmVlT3V0 bGluZSkKICAgICAgICAgICAgIHRyZWVPdXRsaW5lLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUuRXZlbnQuRWxlbWVudFJlbW92ZWQsIHtlbGVtZW50OiBj aGlsZH0pOwogICAgIH0KQEAgLTI4MywxMiArMjgzLDYgQEAgV2ViSW5zcGVjdG9yLlRyZWVPdXRs aW5lID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAg ICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5yZW1vdmVDaGlsZEF0SW5kZXgoY2hpbGRJ bmRleCwgc3VwcHJlc3NPbkRlc2VsZWN0LCBzdXBwcmVzc1NlbGVjdFNpYmxpbmcpOwotCi0gICAg ICAgIGlmICghdGhpcy5jaGlsZHJlbi5sZW5ndGgpIHsKLSAgICAgICAgICAgIGlmICh0aGlzLl9s aXN0SXRlbU5vZGUpCi0gICAgICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmNsYXNzTGlz dC5yZW1vdmUoInBhcmVudCIpOwotICAgICAgICAgICAgdGhpcy5oYXNDaGlsZHJlbiA9IGZhbHNl OwotICAgICAgICB9CiAgICAgfQogCiAgICAgcmVtb3ZlQ2hpbGRyZW4oc3VwcHJlc3NPbkRlc2Vs ZWN0KQpAQCAtNjIyLDcgKzYxNiw3IEBAIFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZSA9IGNsYXNz IFRyZWVPdXRsaW5lIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAgICAgZ2V0IHNlbGVj dGVkVHJlZUVsZW1lbnRJbmRleCgpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuaGFzQ2hpbGRy ZW4gfHwgIXRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudCkKKyAgICAgICAgaWYgKCF0aGlzLmNoaWxk cmVuLmxlbmd0aCB8fCAhdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50KQogICAgICAgICAgICAgcmV0 dXJuOwogCiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5jaGlsZHJlbi5sZW5ndGg7 ICsraSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVmlzdWFsU3R5bGVDb21tYVNlcGFyYXRlZEtleXdvcmRFZGl0b3IuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUNvbW1hU2VwYXJh dGVkS2V5d29yZEVkaXRvci5qcwppbmRleCAwMmEwMzM0M2I0ZS4uM2Q0MGUwZDM0NTcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0 eWxlQ29tbWFTZXBhcmF0ZWRLZXl3b3JkRWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlQ29tbWFTZXBhcmF0ZWRLZXl3b3Jk RWRpdG9yLmpzCkBAIC02OCw3ICs2OCw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUNvbW1h U2VwYXJhdGVkS2V5d29yZEVkaXRvciA9IGNsYXNzIFZpc3VhbFN0eWxlQ29tbWFTZXBhCiAKICAg ICBnZXQgdmFsdWUoKQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9jb21tYVNlcGFyYXRlZEtl eXdvcmRzLmhhc0NoaWxkcmVuKQorICAgICAgICBpZiAoIXRoaXMuX2NvbW1hU2VwYXJhdGVkS2V5 d29yZHMuY2hpbGRyZW4ubGVuZ3RoKQogICAgICAgICAgICAgcmV0dXJuICIiOwogCiAgICAgICAg IGxldCB2YWx1ZSA9ICIiOwo= 314205 2017-06-29 18:48:50 -0700 2017-06-29 19:16:09 -0700 Patch 173986.diff text/plain 5466 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlZGMzZDdkNzFjLi5mZjIwN2UyZTQwOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTctMDYtMjkgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJl bW92ZSB1bm5lY2Vzc2FyeSBoYXNDaGlsZHJlbiBmcm9tIFRyZWVPdXRsaW5lCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM5ODYKKworICAgICAgICBS ZXZpZXdlZCBieSBKb3NlcGggUGVjb3Jhcm8uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1RyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5wcm90b3R5cGUuYXBwZW5kQ2hpbGQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lLnByb3RvdHlwZS5pbnNlcnRDaGls ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUucHJvdG90eXBlLnJlbW92ZUNo aWxkQXRJbmRleCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUucHJvdG90eXBl LnJlbW92ZUNoaWxkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5wcm90b3R5 cGUuZ2V0IHNlbGVjdGVkVHJlZUVsZW1lbnRJbmRleCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2NoZWNrT3V0bGluZXNGb3JQZW5k aW5nVmlld1N0YXRlQ29va2llKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlQ29tbWFTZXBhcmF0ZWRLZXl3b3JkRWRpdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlZpc3VhbFN0eWxlQ29tbWFTZXBhcmF0ZWRLZXl3b3JkRWRpdG9yLnByb3RvdHlwZS5nZXQg dmFsdWUpOgorCiAyMDE3LTA2LTI4ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnN0cnVtZW50IGFjdGl2ZSBwaXhlbCBtZW1vcnkg dXNlZCBieSBjYW52YXNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKaW5k ZXggOTUwMzFjM2VhZTAuLmM5M2JlMjI3MWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRl YmFyUGFuZWwuanMKQEAgLTY1Miw3ICs2NTIsNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNp ZGViYXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgog CiAgICAgICAgIHZhciB2aXNpYmxlVHJlZUVsZW1lbnRzID0gW107CiAgICAgICAgIHRoaXMuY29u dGVudFRyZWVPdXRsaW5lcy5mb3JFYWNoKGZ1bmN0aW9uKG91dGxpbmUpIHsKLSAgICAgICAgICAg IHZhciBjdXJyZW50VHJlZUVsZW1lbnQgPSBvdXRsaW5lLmhhc0NoaWxkcmVuID8gb3V0bGluZS5j aGlsZHJlblswXSA6IG51bGw7CisgICAgICAgICAgICB2YXIgY3VycmVudFRyZWVFbGVtZW50ID0g b3V0bGluZS5jaGlsZHJlbi5sZW5ndGggPyBvdXRsaW5lLmNoaWxkcmVuWzBdIDogbnVsbDsKICAg ICAgICAgICAgIHdoaWxlIChjdXJyZW50VHJlZUVsZW1lbnQpIHsKICAgICAgICAgICAgICAgICB2 aXNpYmxlVHJlZUVsZW1lbnRzLnB1c2goY3VycmVudFRyZWVFbGVtZW50KTsKICAgICAgICAgICAg ICAgICBjdXJyZW50VHJlZUVsZW1lbnQgPSBjdXJyZW50VHJlZUVsZW1lbnQudHJhdmVyc2VOZXh0 VHJlZUVsZW1lbnQoZmFsc2UsIG51bGwsIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKaW5kZXggOWU2 ODI3NWYxYzIuLjhhNmJlNGQwNTc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwpAQCAtNDQsNyArNDQsNiBA QCBXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdl Ykluc3BlY3Rvci5PYmplY3QKICAgICAgICAgdGhpcy5fdHJlZUVsZW1lbnRzRXhwYW5kZWRTdGF0 ZSA9IFtdOwogICAgICAgICB0aGlzLmFsbG93c1JlcGVhdFNlbGVjdGlvbiA9IGZhbHNlOwogICAg ICAgICB0aGlzLnJvb3QgPSB0cnVlOwotICAgICAgICB0aGlzLmhhc0NoaWxkcmVuID0gZmFsc2U7 CiAgICAgICAgIHRoaXMuZXhwYW5kZWQgPSB0cnVlOwogICAgICAgICB0aGlzLnNlbGVjdGVkID0g ZmFsc2U7CiAgICAgICAgIHRoaXMudHJlZU91dGxpbmUgPSB0aGlzOwpAQCAtMTU2LDcgKzE1NSw2 IEBAIFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZSA9IGNsYXNzIFRyZWVPdXRsaW5lIGV4dGVuZHMg V2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB2YXIgaXNGaXJzdENoaWxkID0gIXRoaXMuY2hp bGRyZW4ubGVuZ3RoOwogCiAgICAgICAgIHRoaXMuY2hpbGRyZW4ucHVzaChjaGlsZCk7Ci0gICAg ICAgIHRoaXMuaGFzQ2hpbGRyZW4gPSB0cnVlOwogICAgICAgICBjaGlsZC5wYXJlbnQgPSB0aGlz OwogICAgICAgICBjaGlsZC50cmVlT3V0bGluZSA9IHRoaXMudHJlZU91dGxpbmU7CiAgICAgICAg IGNoaWxkLnRyZWVPdXRsaW5lLl9yZW1lbWJlclRyZWVFbGVtZW50KGNoaWxkKTsKQEAgLTIwNiw3 ICsyMDQsNiBAQCBXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBl eHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgdmFyIGlzRmlyc3RDaGlsZCA9ICF0 aGlzLmNoaWxkcmVuLmxlbmd0aDsKIAogICAgICAgICB0aGlzLmNoaWxkcmVuLnNwbGljZShpbmRl eCwgMCwgY2hpbGQpOwotICAgICAgICB0aGlzLmhhc0NoaWxkcmVuID0gdHJ1ZTsKICAgICAgICAg Y2hpbGQucGFyZW50ID0gdGhpczsKICAgICAgICAgY2hpbGQudHJlZU91dGxpbmUgPSB0aGlzLnRy ZWVPdXRsaW5lOwogICAgICAgICBjaGlsZC50cmVlT3V0bGluZS5fcmVtZW1iZXJUcmVlRWxlbWVu dChjaGlsZCk7CkBAIC0yNjcsNiArMjY0LDkgQEAgV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lID0g Y2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIGNo aWxkLm5leHRTaWJsaW5nID0gbnVsbDsKICAgICAgICAgY2hpbGQucHJldmlvdXNTaWJsaW5nID0g bnVsbDsKIAorICAgICAgICBpZiAoIXRoaXMuY2hpbGRyZW4ubGVuZ3RoICYmIHRoaXMuX2xpc3RJ dGVtTm9kZSkKKyAgICAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5jbGFzc0xpc3QucmVtb3Zl KCJwYXJlbnQiKTsKKwogICAgICAgICBpZiAodHJlZU91dGxpbmUpCiAgICAgICAgICAgICB0cmVl T3V0bGluZS5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5l LkV2ZW50LkVsZW1lbnRSZW1vdmVkLCB7ZWxlbWVudDogY2hpbGR9KTsKICAgICB9CkBAIC0yODMs MTIgKzI4Myw2IEBAIFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZSA9IGNsYXNzIFRyZWVPdXRsaW5l IGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAg ICAgIHRoaXMucmVtb3ZlQ2hpbGRBdEluZGV4KGNoaWxkSW5kZXgsIHN1cHByZXNzT25EZXNlbGVj dCwgc3VwcHJlc3NTZWxlY3RTaWJsaW5nKTsKLQotICAgICAgICBpZiAoIXRoaXMuY2hpbGRyZW4u bGVuZ3RoKSB7Ci0gICAgICAgICAgICBpZiAodGhpcy5fbGlzdEl0ZW1Ob2RlKQotICAgICAgICAg ICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5jbGFzc0xpc3QucmVtb3ZlKCJwYXJlbnQiKTsKLSAg ICAgICAgICAgIHRoaXMuaGFzQ2hpbGRyZW4gPSBmYWxzZTsKLSAgICAgICAgfQogICAgIH0KIAog ICAgIHJlbW92ZUNoaWxkcmVuKHN1cHByZXNzT25EZXNlbGVjdCkKQEAgLTYyMiw3ICs2MTYsNyBA QCBXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdl Ykluc3BlY3Rvci5PYmplY3QKIAogICAgIGdldCBzZWxlY3RlZFRyZWVFbGVtZW50SW5kZXgoKQog ICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLmhhc0NoaWxkcmVuIHx8ICF0aGlzLnNlbGVjdGVkVHJl ZUVsZW1lbnQpCisgICAgICAgIGlmICghdGhpcy5jaGlsZHJlbi5sZW5ndGggfHwgIXRoaXMuc2Vs ZWN0ZWRUcmVlRWxlbWVudCkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHRoaXMuY2hpbGRyZW4ubGVuZ3RoOyArK2kpIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlQ29tbWFT ZXBhcmF0ZWRLZXl3b3JkRWRpdG9yLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVmlzdWFsU3R5bGVDb21tYVNlcGFyYXRlZEtleXdvcmRFZGl0b3IuanMKaW5k ZXggMDJhMDMzNDNiNGUuLjNkNDBlMGQzNDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUNvbW1hU2VwYXJhdGVkS2V5d29y ZEVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9WaXN1YWxTdHlsZUNvbW1hU2VwYXJhdGVkS2V5d29yZEVkaXRvci5qcwpAQCAtNjgsNyArNjgs NyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVDb21tYVNlcGFyYXRlZEtleXdvcmRFZGl0b3Ig PSBjbGFzcyBWaXN1YWxTdHlsZUNvbW1hU2VwYQogCiAgICAgZ2V0IHZhbHVlKCkKICAgICB7Ci0g ICAgICAgIGlmICghdGhpcy5fY29tbWFTZXBhcmF0ZWRLZXl3b3Jkcy5oYXNDaGlsZHJlbikKKyAg ICAgICAgaWYgKCF0aGlzLl9jb21tYVNlcGFyYXRlZEtleXdvcmRzLmNoaWxkcmVuLmxlbmd0aCkK ICAgICAgICAgICAgIHJldHVybiAiIjsKIAogICAgICAgICBsZXQgdmFsdWUgPSAiIjsK