151033 2015-11-09 09:24:26 -0800 [Streams API] Shield promises when prototype is replaced from a promise 2015-11-10 05:25:36 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 calvaris calvaris benjamin commit-queue darin youennf oldest_to_newest 1140386 0 calvaris 2015-11-09 09:24:26 -0800 [Streams API] Shield promises when prototype is replaced from a promise 1140388 1 265062 calvaris 2015-11-09 09:27:30 -0800 Created attachment 265062 Patch 1140401 2 calvaris 2015-11-09 09:51:29 -0800 I'll land this tomorrow as I don't have too much time left. 1140438 3 265076 calvaris 2015-11-09 11:18:34 -0800 Created attachment 265076 Patch Rebased, will cq+ tomorrow 1140710 4 265076 commit-queue 2015-11-10 00:51:02 -0800 Comment on attachment 265076 Patch Clearing flags on attachment: 265076 Committed r192207: <http://trac.webkit.org/changeset/192207> 1140711 5 commit-queue 2015-11-10 00:51:07 -0800 All reviewed patches have been landed. Closing bug. 1140744 6 youennf 2015-11-10 05:25:36 -0800 Nice work :) The only minor issue I have is that the code is new somehow less readable. It would have been good to be able to keep blabla.....@then. One approach for doing so might be to do specific handling like for @call/@apply. But I prefer your simpler approach. This is not worth it, at least in the current situation where streams API is the only API consuming user-land promises. 265062 2015-11-09 09:27:30 -0800 2015-11-09 11:18:28 -0800 Patch bug-151033-20151109182726.patch text/plain 10285 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyMTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmFjZTBiNmM0ZjBlMDBk ZDI3ZmRmMTIxNjgyMTcwYmI4NjNjN2YwYy4uMTgyMGQ0NmY1OTdkYjcxMWZhZjc0NDFiNjhmNTA3 ZjI0MTk0NjEwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE1LTExLTA5ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKKyAgICAgICAgW1N0 cmVhbXMgQVBJXSBTaGllbGQgcHJvbWlzZXMgd2hlbiBwcm90b3R5cGUgaXMgcmVwbGFjZWQgZnJv bSBhIHByb21pc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1MTAzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEluc3RlYWQgb2YgY2FsbGluZyBAdGhlbiBvciBAY2F0Y2gsIHRoYXQgY291bGQgaGF2ZSBk aXNhcHBlYXJlZCBpZiB0aGUgdXNlciBzdWNjZXNzZnVsbHkgcmVwbGFjZXMgYSBwcm9taXNlCisg ICAgICAgIGNvbnN0cnVjdG9yLCB3ZSBjYWxsIHRoZSBtZXRob2RzIHN0b3JlZCBhdCBAUHJvbWlz ZS5wcm90b3R5cGUsIHdoaWNoIGFyZSBzYWZlIGFzIEBQcm9taXNlLnByb3RvdHlwZS5AdGhlbi5A Y2FsbAorICAgICAgICBhbmQgQFByb21pc2UucHJvdG90eXBlLkBjYXRjaC5AY2FsbC4KKworICAg ICAgICBUZXN0OiBzdHJlYW1zL3N0cmVhbXMtcHJvbWlzZXMuaHRtbCwgZXhwZWN0YXRpb25zIHVw ZGF0ZWQuCisKKyAgICAgICAgKiBNb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uanM6Cisg ICAgICAgIChpbml0aWFsaXplUmVhZGFibGVTdHJlYW0pOgorICAgICAgICAqIE1vZHVsZXMvc3Ry ZWFtcy9SZWFkYWJsZVN0cmVhbUludGVybmFscy5qczoKKyAgICAgICAgKHRlZVJlYWRhYmxlU3Ry ZWFtKToKKyAgICAgICAgKHRlZVJlYWRhYmxlU3RyZWFtUHVsbEZ1bmN0aW9uKToKKyAgICAgICAg KHRlZVJlYWRhYmxlU3RyZWFtQnJhbmNoMkNhbmNlbEZ1bmN0aW9uKToKKyAgICAgICAgKGNhbmNl bFJlYWRhYmxlU3RyZWFtKToKKyAgICAgICAgKiBNb2R1bGVzL3N0cmVhbXMvV3JpdGFibGVTdHJl YW0uanM6CisgICAgICAgIChpbml0aWFsaXplV3JpdGFibGVTdHJlYW0pOgorICAgICAgICAoYWJv cnQpOgorICAgICAgICAqIE1vZHVsZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVhbUludGVybmFscy5q czoKKyAgICAgICAgKGNhbGxPclNjaGVkdWxlV3JpdGFibGVTdHJlYW1BZHZhbmNlUXVldWUpOgor CisyMDE1LTExLTA5ICBYYWJpZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5j b20+CisKICAgICAgICAgW1N0cmVhbXMgQVBJXSBTaGllbGQgaW1wbGVtZW50YXRpb24gZnJvbSBt YW5nbGluZyB0aGVuIGFuZCBjYXRjaCBwcm9taXNlIG1ldGhvZHMKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDkzNAogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uanMgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uanMKaW5kZXggNzZiNWM2NzA0NDIx YzU1NmVmYWRlZWJlMzNjMTJiNmNhMmI3OTQ5MC4uZWE0MjNkOGM3M2JjZWQyMzYzZTNmZmVhYmQz NjZlN2JmYmYzZWFiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1z L1JlYWRhYmxlU3RyZWFtLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9S ZWFkYWJsZVN0cmVhbS5qcwpAQCAtNTYsNyArNTYsNyBAQCBmdW5jdGlvbiBpbml0aWFsaXplUmVh ZGFibGVTdHJlYW0odW5kZXJseWluZ1NvdXJjZSwgc3RyYXRlZ3kpCiAKICAgICB2YXIgcmVzdWx0 ID0gQGludm9rZU9yTm9vcCh1bmRlcmx5aW5nU291cmNlLCAic3RhcnQiLCBbdGhpcy5AY29udHJv bGxlcl0pOwogICAgIHZhciBfdGhpcyA9IHRoaXM7Ci0gICAgQFByb21pc2UuQHJlc29sdmUocmVz dWx0KS5AdGhlbihmdW5jdGlvbigpIHsKKyAgICBAUHJvbWlzZS5wcm90b3R5cGUuQHRoZW4uQGNh bGwoQFByb21pc2UuQHJlc29sdmUocmVzdWx0KSwgZnVuY3Rpb24oKSB7CiAgICAgICAgIF90aGlz LkBzdGFydGVkID0gdHJ1ZTsKICAgICAgICAgQHJlcXVlc3RSZWFkYWJsZVN0cmVhbVB1bGwoX3Ro aXMpOwogICAgIH0sIGZ1bmN0aW9uKGVycm9yKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1JbnRlcm5hbHMuanMgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1JbnRlcm5hbHMuanMKaW5kZXggNTVk MTdmZTljNDA0ZWIyNjA2ODY5MjgwY2MwNzY2NGJjNjU3MTllZS4uNzU2NTQzOTdjOTM3MzgzYjRh MzhkYTU2Mzg1ZTM5OGNlNWE5MWZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtSW50ZXJuYWxzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbUludGVybmFscy5qcwpAQCAtMTA2LDcgKzEw Niw3IEBAIGZ1bmN0aW9uIHRlZVJlYWRhYmxlU3RyZWFtKHN0cmVhbSwgc2hvdWxkQ2xvbmUpCiAg ICAgbGV0IGJyYW5jaDEgPSBuZXcgUmVhZGFibGVTdHJlYW0odW5kZXJseWluZ1NvdXJjZTEpOwog ICAgIGxldCBicmFuY2gyID0gbmV3IFJlYWRhYmxlU3RyZWFtKHVuZGVybHlpbmdTb3VyY2UyKTsK IAotICAgIHJlYWRlci5jbG9zZWQuQGNhdGNoKGZ1bmN0aW9uKGUpIHsKKyAgICBAUHJvbWlzZS5w cm90b3R5cGUuQGNhdGNoLkBjYWxsKHJlYWRlci5jbG9zZWQsIGZ1bmN0aW9uKGUpIHsKICAgICAg ICAgaWYgKHRlZVN0YXRlLmNsb3NlZE9yRXJyb3JlZCkKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgQGVycm9yUmVhZGFibGVTdHJlYW0oYnJhbmNoMSwgZSk7CkBAIC0xMjQsNyArMTI0LDcg QEAgZnVuY3Rpb24gdGVlUmVhZGFibGVTdHJlYW0oc3RyZWFtLCBzaG91bGRDbG9uZSkKIGZ1bmN0 aW9uIHRlZVJlYWRhYmxlU3RyZWFtUHVsbEZ1bmN0aW9uKHRlZVN0YXRlLCByZWFkZXIsIHNob3Vs ZENsb25lKQogewogICAgIHJldHVybiBmdW5jdGlvbigpIHsKLSAgICAgICAgcmVhZGVyLnJlYWQo KS5AdGhlbihmdW5jdGlvbihyZXN1bHQpIHsKKyAgICAgICAgQFByb21pc2UucHJvdG90eXBlLkB0 aGVuLkBjYWxsKHJlYWRlci5yZWFkKCksIGZ1bmN0aW9uKHJlc3VsdCkgewogICAgICAgICAgICAg aWYgKHJlc3VsdC5kb25lICYmICF0ZWVTdGF0ZS5jbG9zZWRPckVycm9yZWQpIHsKICAgICAgICAg ICAgICAgICBAY2xvc2VSZWFkYWJsZVN0cmVhbSh0ZWVTdGF0ZS5icmFuY2gxKTsKICAgICAgICAg ICAgICAgICBAY2xvc2VSZWFkYWJsZVN0cmVhbSh0ZWVTdGF0ZS5icmFuY2gyKTsKQEAgLTE1MCw4 ICsxNTAsOSBAQCBmdW5jdGlvbiB0ZWVSZWFkYWJsZVN0cmVhbUJyYW5jaDFDYW5jZWxGdW5jdGlv bih0ZWVTdGF0ZSwgc3RyZWFtKQogICAgICAgICB0ZWVTdGF0ZS5jYW5jZWxlZDEgPSB0cnVlOwog ICAgICAgICB0ZWVTdGF0ZS5yZWFzb24xID0gcjsKICAgICAgICAgaWYgKHRlZVN0YXRlLmNhbmNl bGVkMikgewotICAgICAgICAgICAgQGNhbmNlbFJlYWRhYmxlU3RyZWFtKHN0cmVhbSwgW3RlZVN0 YXRlLnJlYXNvbjEsIHRlZVN0YXRlLnJlYXNvbjJdKS50aGVuKHRlZVN0YXRlLmNhbmNlbFByb21p c2VDYXBhYmlsaXR5LkByZXNvbHZlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRlZVN0 YXRlLmNhbmNlbFByb21pc2VDYXBhYmlsaXR5LkByZWplY3QpOworICAgICAgICAgICAgQFByb21p c2UucHJvdG90eXBlLkB0aGVuLkBjYWxsKEBjYW5jZWxSZWFkYWJsZVN0cmVhbShzdHJlYW0sIFt0 ZWVTdGF0ZS5yZWFzb24xLCB0ZWVTdGF0ZS5yZWFzb24yXSksCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdGVlU3RhdGUuY2FuY2VsUHJvbWlzZUNhcGFiaWxpdHku QHJlc29sdmUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGVl U3RhdGUuY2FuY2VsUHJvbWlzZUNhcGFiaWxpdHkuQHJlamVjdCk7CiAgICAgICAgIH0KICAgICAg ICAgcmV0dXJuIHRlZVN0YXRlLmNhbmNlbFByb21pc2VDYXBhYmlsaXR5LkBwcm9taXNlOwogICAg IH0KQEAgLTE2Myw4ICsxNjQsOSBAQCBmdW5jdGlvbiB0ZWVSZWFkYWJsZVN0cmVhbUJyYW5jaDJD YW5jZWxGdW5jdGlvbih0ZWVTdGF0ZSwgc3RyZWFtKQogICAgICAgICB0ZWVTdGF0ZS5jYW5jZWxl ZDIgPSB0cnVlOwogICAgICAgICB0ZWVTdGF0ZS5yZWFzb24yID0gcjsKICAgICAgICAgaWYgKHRl ZVN0YXRlLmNhbmNlbGVkMSkgewotICAgICAgICAgICAgQGNhbmNlbFJlYWRhYmxlU3RyZWFtKHN0 cmVhbSwgW3RlZVN0YXRlLnJlYXNvbjEsIHRlZVN0YXRlLnJlYXNvbjJdKS50aGVuKHRlZVN0YXRl LmNhbmNlbFByb21pc2VDYXBhYmlsaXR5LkByZXNvbHZlLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHRlZVN0YXRlLmNhbmNlbFByb21pc2VDYXBhYmlsaXR5LkByZWplY3QpOworICAgICAg ICAgICAgQFByb21pc2UucHJvdG90eXBlLkB0aGVuLkBjYWxsKEBjYW5jZWxSZWFkYWJsZVN0cmVh bShzdHJlYW0sIFt0ZWVTdGF0ZS5yZWFzb24xLCB0ZWVTdGF0ZS5yZWFzb24yXSksCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGVlU3RhdGUuY2FuY2VsUHJvbWlz ZUNhcGFiaWxpdHkuQHJlc29sdmUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdGVlU3RhdGUuY2FuY2VsUHJvbWlzZUNhcGFiaWxpdHkuQHJlamVjdCk7CiAgICAg ICAgIH0KICAgICAgICAgcmV0dXJuIHRlZVN0YXRlLmNhbmNlbFByb21pc2VDYXBhYmlsaXR5LkBw cm9taXNlOwogICAgIH0KQEAgLTIzNyw3ICsyMzksNyBAQCBmdW5jdGlvbiByZXF1ZXN0UmVhZGFi bGVTdHJlYW1QdWxsKHN0cmVhbSkKICAgICBzdHJlYW0uQHB1bGxpbmcgPSB0cnVlOwogCiAgICAg dmFyIHByb21pc2UgPSBAcHJvbWlzZUludm9rZU9yTm9vcChzdHJlYW0uQHVuZGVybHlpbmdTb3Vy Y2UsICJwdWxsIiwgW3N0cmVhbS5AY29udHJvbGxlcl0pOwotICAgIHByb21pc2UuQHRoZW4oZnVu Y3Rpb24oKSB7CisgICAgQFByb21pc2UucHJvdG90eXBlLkB0aGVuLkBjYWxsKHByb21pc2UsIGZ1 bmN0aW9uKCkgewogICAgICAgICBzdHJlYW0uQHB1bGxpbmcgPSBmYWxzZTsKICAgICAgICAgaWYg KHN0cmVhbS5AcHVsbEFnYWluKSB7CiAgICAgICAgICAgICBzdHJlYW0uQHB1bGxBZ2FpbiA9IGZh bHNlOwpAQCAtMjgwLDcgKzI4Miw3IEBAIGZ1bmN0aW9uIGNhbmNlbFJlYWRhYmxlU3RyZWFtKHN0 cmVhbSwgcmVhc29uKQogICAgICAgICByZXR1cm4gQFByb21pc2UuQHJlamVjdChzdHJlYW0uQHN0 b3JlZEVycm9yKTsKICAgICBzdHJlYW0uQHF1ZXVlID0gQG5ld1F1ZXVlKCk7CiAgICAgQGZpbmlz aENsb3NpbmdSZWFkYWJsZVN0cmVhbShzdHJlYW0pOwotICAgIHJldHVybiBAcHJvbWlzZUludm9r ZU9yTm9vcChzdHJlYW0uQHVuZGVybHlpbmdTb3VyY2UsICJjYW5jZWwiLCBbcmVhc29uXSkuQHRo ZW4oZnVuY3Rpb24oKSB7IH0pOworICAgIHJldHVybiBAUHJvbWlzZS5wcm90b3R5cGUuQHRoZW4u QGNhbGwoQHByb21pc2VJbnZva2VPck5vb3Aoc3RyZWFtLkB1bmRlcmx5aW5nU291cmNlLCAiY2Fu Y2VsIiwgW3JlYXNvbl0pLCBmdW5jdGlvbigpIHsgfSk7CiB9CiAKIGZ1bmN0aW9uIGZpbmlzaENs b3NpbmdSZWFkYWJsZVN0cmVhbShzdHJlYW0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3N0cmVhbXMvV3JpdGFibGVTdHJlYW0uanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L3N0cmVhbXMvV3JpdGFibGVTdHJlYW0uanMKaW5kZXggZTVlNDAwZjgzOGZlZTM0ZmEyZGRmY2Zh ZGJiNzNiYjVkNDU2ZGM0Ny4uMjQyZmI4ZWZmYjExNDhmMzQ0NjJkNWU3YTk4YWNhYjFjY2M4Y2Vm MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1dyaXRhYmxlU3Ry ZWFtLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVh bS5qcwpAQCAtNTcsNyArNTcsNyBAQCBmdW5jdGlvbiBpbml0aWFsaXplV3JpdGFibGVTdHJlYW0o dW5kZXJseWluZ1NpbmssIHN0cmF0ZWd5KQogICAgIHZhciBzdGFydFJlc3VsdCA9IEBpbnZva2VP ck5vb3AodW5kZXJseWluZ1NpbmssICJzdGFydCIsIFtlcnJvcl0pOwogICAgIHRoaXMuQHN0YXJ0 ZWRQcm9taXNlID0gQFByb21pc2UuQHJlc29sdmUoc3RhcnRSZXN1bHQpOwogICAgIHZhciBfdGhp cyA9IHRoaXM7Ci0gICAgdGhpcy5Ac3RhcnRlZFByb21pc2UuQHRoZW4oZnVuY3Rpb24oKSB7Cisg ICAgQFByb21pc2UucHJvdG90eXBlLkB0aGVuLkBjYWxsKHRoaXMuQHN0YXJ0ZWRQcm9taXNlLCBm dW5jdGlvbigpIHsKICAgICAgICAgX3RoaXMuQHN0YXJ0ZWQgPSB0cnVlOwogICAgICAgICBfdGhp cy5Ac3RhcnRlZFByb21pc2UgPSB1bmRlZmluZWQ7CiAgICAgfSwgZXJyb3IpOwpAQCAtODIsNyAr ODIsNyBAQCBmdW5jdGlvbiBhYm9ydChyZWFzb24pCiAKICAgICBjb25zdCBzaW5rQWJvcnRQcm9t aXNlID0gQHByb21pc2VJbnZva2VPckZhbGxiYWNrT3JOb29wKHRoaXMuQHVuZGVybHlpbmdTaW5r LCAiYWJvcnQiLCBbcmVhc29uXSwgImNsb3NlIiwgW10pOwogCi0gICAgcmV0dXJuIHNpbmtBYm9y dFByb21pc2UuQHRoZW4oZnVuY3Rpb24oKSB7IHJldHVybiB1bmRlZmluZWQ7IH0pOworICAgIHJl dHVybiBAUHJvbWlzZS5wcm90b3R5cGUuQHRoZW4uQGNhbGwoc2lua0Fib3J0UHJvbWlzZSwgZnVu Y3Rpb24oKSB7IHJldHVybiB1bmRlZmluZWQ7IH0pOwogfQogCiBmdW5jdGlvbiBjbG9zZSgpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvV3JpdGFibGVTdHJlYW1J bnRlcm5hbHMuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvV3JpdGFibGVTdHJl YW1JbnRlcm5hbHMuanMKaW5kZXggOTg1OGRlNjQzMTUyYTgzYThlYmVjNTIxZGVmMTdmZWM2Y2Q5 MDM1Zi4uMWVlZGNkOGU1MjcxMjI3ODgzNjFhZjg5NWFjMjk1N2VhZGNhZjIwNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1dyaXRhYmxlU3RyZWFtSW50ZXJuYWxz LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVhbUlu dGVybmFscy5qcwpAQCAtNzcsNyArNzcsNyBAQCBmdW5jdGlvbiBlcnJvcldyaXRhYmxlU3RyZWFt KGUpCiBmdW5jdGlvbiBjYWxsT3JTY2hlZHVsZVdyaXRhYmxlU3RyZWFtQWR2YW5jZVF1ZXVlKHN0 cmVhbSkKIHsKICAgICBpZiAoIXN0cmVhbS5Ac3RhcnRlZCkKLSAgICAgICAgc3RyZWFtLkBzdGFy dGVkUHJvbWlzZS5AdGhlbihmdW5jdGlvbigpIHsgQHdyaXRhYmxlU3RyZWFtQWR2YW5jZVF1ZXVl KHN0cmVhbSk7IH0pOworICAgICAgICBAUHJvbWlzZS5wcm90b3R5cGUuQHRoZW4uQGNhbGwoc3Ry ZWFtLkBzdGFydGVkUHJvbWlzZSwgZnVuY3Rpb24oKSB7IEB3cml0YWJsZVN0cmVhbUFkdmFuY2VR dWV1ZShzdHJlYW0pOyB9KTsKICAgICBlbHNlCiAgICAgICAgIEB3cml0YWJsZVN0cmVhbUFkdmFu Y2VRdWV1ZShzdHJlYW0pOwogCkBAIC0xMDEsNyArMTAxLDcgQEAgZnVuY3Rpb24gd3JpdGFibGVT dHJlYW1BZHZhbmNlUXVldWUoc3RyZWFtKQogICAgIH0KIAogICAgIHN0cmVhbS5Ad3JpdGluZyA9 IHRydWU7Ci0gICAgQHByb21pc2VJbnZva2VPck5vb3Aoc3RyZWFtLkB1bmRlcmx5aW5nU2luaywg IndyaXRlIiwgW3dyaXRlUmVjb3JkLmNodW5rXSkuQHRoZW4oCisgICAgQFByb21pc2UucHJvdG90 eXBlLkB0aGVuLkBjYWxsKEBwcm9taXNlSW52b2tlT3JOb29wKHN0cmVhbS5AdW5kZXJseWluZ1Np bmssICJ3cml0ZSIsIFt3cml0ZVJlY29yZC5jaHVua10pLAogICAgICAgICBmdW5jdGlvbigpIHsK ICAgICAgICAgICAgIGlmIChzdHJlYW0uQHN0YXRlID09PSBAc3RyZWFtRXJyb3JlZCkKICAgICAg ICAgICAgICAgICByZXR1cm47CkBAIC0xMjMsNyArMTIzLDcgQEAgZnVuY3Rpb24gY2xvc2VXcml0 YWJsZVN0cmVhbShzdHJlYW0pCiB7CiAgICAgLy8gRklYTUUKICAgICAvLyBhc3NlcnQoc3RyZWFt LkBzdGF0ZSA9PT0gQHN0cmVhbUNsb3NpbmcpOwotICAgIEBwcm9taXNlSW52b2tlT3JOb29wKHN0 cmVhbS5AdW5kZXJseWluZ1NpbmssICJjbG9zZSIpLkB0aGVuKAorICAgIEBQcm9taXNlLnByb3Rv dHlwZS5AdGhlbi5AY2FsbChAcHJvbWlzZUludm9rZU9yTm9vcChzdHJlYW0uQHVuZGVybHlpbmdT aW5rLCAiY2xvc2UiKSwKICAgICAgICAgZnVuY3Rpb24oKSB7CiAgICAgICAgICAgICBpZiAoc3Ry ZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbUVycm9yZWQpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IDUzYjQxMDVlNGYzYTAyODhiNWM1YjczNDUyMDk0NDc2NzhjN2RkM2IuLjkzOGFjZjEy MmFlMWZlMmQ3NDBmNmE1ZTE1YzFhNjZlMTE4MDFhNmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNCBAQAog MjAxNS0xMS0wOSAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29t PgogCisgICAgICAgIFtTdHJlYW1zIEFQSV0gU2hpZWxkIHByb21pc2VzIHdoZW4gcHJvdG90eXBl IGlzIHJlcGxhY2VkIGZyb20gYSBwcm9taXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTEwMzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHN0cmVhbXMvc3RyZWFtcy1wcm9taXNlcy1leHBlY3RlZC50 eHQ6IFVwZGF0ZWQgZXhwZWN0YXRpb25zLgorCisyMDE1LTExLTA5ICBYYWJpZXIgUm9kcmlndWV6 IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKICAgICAgICAgW1N0cmVhbXMgQVBJXSBT aGllbGQgaW1wbGVtZW50YXRpb24gZnJvbSBtYW5nbGluZyB0aGVuIGFuZCBjYXRjaCBwcm9taXNl IG1ldGhvZHMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1MDkzNAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdHJlYW1zL3N0cmVhbXMtcHJvbWlz ZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvc3RyZWFtcy9zdHJlYW1zLXByb21pc2VzLWV4 cGVjdGVkLnR4dAppbmRleCBmM2ZjZTQ4NGQyZWQ1ZDhmOTNkYTcwNTVhNWU1YTVjMTJlYmYzNGJi Li40ZDYxZTRhODNiOTg5ZmYyZGYwNTA0MmU2NzNiNmU1OGVmMTRlNTE0IDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9zdHJlYW1zL3N0cmVhbXMtcHJvbWlzZXMtZXhwZWN0ZWQudHh0CisrKyBiL0xh eW91dFRlc3RzL3N0cmVhbXMvc3RyZWFtcy1wcm9taXNlcy1leHBlY3RlZC50eHQKQEAgLTIsNyAr Miw3IEBACiBQQVNTIFN0cmVhbXMgYW5kIHByb21pc2VzOiByZXBsYWNlIFByb21pc2UgY29uc3Ry dWN0b3IgCiBQQVNTIFN0cmVhbXMgYW5kIHByb21pc2VzOiByZXBsYWNlIFByb21pc2UucmVzb2x2 ZSAKIFBBU1MgU3RyZWFtcyBhbmQgcHJvbWlzZXM6IHJlcGxhY2UgUHJvbWlzZS5yZWplY3QgCi1G QUlMIFN0cmVhbXMgYW5kIHByb21pc2VzOiByZXBsYWNlIHByb3RvdHlwZSBvZiBhIHByb21pc2Ug b2JqZWN0IHVuZGVmaW5lZCBpcyBub3QgYSBmdW5jdGlvbgorUEFTUyBTdHJlYW1zIGFuZCBwcm9t aXNlczogcmVwbGFjZSBwcm90b3R5cGUgb2YgYSBwcm9taXNlIG9iamVjdCAKIFBBU1MgU3RyZWFt cyBhbmQgcHJvbWlzZXM6IHJlcGxhY2UgdGhlbiBtZXRob2QgaW4gUHJvbWlzZSBwcm90b3R5cGUg CiBQQVNTIFN0cmVhbXMgYW5kIHByb21pc2VzOiByZXBsYWNlIGNhdGNoIG1ldGhvZCBpbiBQcm9t aXNlIHByb3RvdHlwZSAKIFBBU1MgU3RyZWFtcyBhbmQgcHJvbWlzZXM6IHJlcGxhY2UgdGhlbiBt ZXRob2QgaW4gcHJvbWlzZSBvYmplY3QgCg== 265076 2015-11-09 11:18:34 -0800 2015-11-10 00:51:02 -0800 Patch bug-151033-20151109201830.patch text/plain 10204 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyMTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWZmMzZlNDMxYzI3NjI5 M2I5ZDYxYmI2Mjc3MjI0YmVkOWZlYzdlNi4uMzZhMzk0MDdmZDM2N2UwZDAzMDhhZGYyMTJiZTIy OWQyZWM5MDYzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTExLTA5ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW1N0 cmVhbXMgQVBJXSBTaGllbGQgcHJvbWlzZXMgd2hlbiBwcm90b3R5cGUgaXMgcmVwbGFjZWQgZnJv bSBhIHByb21pc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1MTAzMworCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAg IEluc3RlYWQgb2YgY2FsbGluZyBAdGhlbiBvciBAY2F0Y2gsIHRoYXQgY291bGQgaGF2ZSBkaXNh cHBlYXJlZCBpZiB0aGUgdXNlciBzdWNjZXNzZnVsbHkgcmVwbGFjZXMgYSBwcm9taXNlCisgICAg ICAgIGNvbnN0cnVjdG9yLCB3ZSBjYWxsIHRoZSBtZXRob2RzIHN0b3JlZCBhdCBAUHJvbWlzZS5w cm90b3R5cGUsIHdoaWNoIGFyZSBzYWZlIGFzIEBQcm9taXNlLnByb3RvdHlwZS5AdGhlbi5AY2Fs bAorICAgICAgICBhbmQgQFByb21pc2UucHJvdG90eXBlLkBjYXRjaC5AY2FsbC4KKworICAgICAg ICBUZXN0OiBzdHJlYW1zL3N0cmVhbXMtcHJvbWlzZXMuaHRtbCwgZXhwZWN0YXRpb25zIHVwZGF0 ZWQuCisKKyAgICAgICAgKiBNb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uanM6CisgICAg ICAgIChpbml0aWFsaXplUmVhZGFibGVTdHJlYW0pOgorICAgICAgICAqIE1vZHVsZXMvc3RyZWFt cy9SZWFkYWJsZVN0cmVhbUludGVybmFscy5qczoKKyAgICAgICAgKHRlZVJlYWRhYmxlU3RyZWFt KToKKyAgICAgICAgKHRlZVJlYWRhYmxlU3RyZWFtUHVsbEZ1bmN0aW9uKToKKyAgICAgICAgKHRl ZVJlYWRhYmxlU3RyZWFtQnJhbmNoMkNhbmNlbEZ1bmN0aW9uKToKKyAgICAgICAgKGNhbmNlbFJl YWRhYmxlU3RyZWFtKToKKyAgICAgICAgKiBNb2R1bGVzL3N0cmVhbXMvV3JpdGFibGVTdHJlYW0u anM6CisgICAgICAgIChpbml0aWFsaXplV3JpdGFibGVTdHJlYW0pOgorICAgICAgICAoYWJvcnQp OgorICAgICAgICAqIE1vZHVsZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVhbUludGVybmFscy5qczoK KyAgICAgICAgKGNhbGxPclNjaGVkdWxlV3JpdGFibGVTdHJlYW1BZHZhbmNlUXVldWUpOgorCiAy MDE1LTExLTA5ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBN b2Rlcm4gSURCOiBSZWZhY3RvciBtZW1vcnkgb2JqZWN0c3RvcmUvdHJhbnNhY3Rpb24gaW50ZXJh dGlvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJs ZVN0cmVhbS5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVh bS5qcwppbmRleCA3NmI1YzY3MDQ0MjFjNTU2ZWZhZGVlYmUzM2MxMmI2Y2EyYjc5NDkwLi5lYTQy M2Q4YzczYmNlZDIzNjNlM2ZmZWFiZDM2NmU3YmZiZjNlYWJhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uanMKKysrIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtLmpzCkBAIC01Niw3ICs1Niw3IEBA IGZ1bmN0aW9uIGluaXRpYWxpemVSZWFkYWJsZVN0cmVhbSh1bmRlcmx5aW5nU291cmNlLCBzdHJh dGVneSkKIAogICAgIHZhciByZXN1bHQgPSBAaW52b2tlT3JOb29wKHVuZGVybHlpbmdTb3VyY2Us ICJzdGFydCIsIFt0aGlzLkBjb250cm9sbGVyXSk7CiAgICAgdmFyIF90aGlzID0gdGhpczsKLSAg ICBAUHJvbWlzZS5AcmVzb2x2ZShyZXN1bHQpLkB0aGVuKGZ1bmN0aW9uKCkgeworICAgIEBQcm9t aXNlLnByb3RvdHlwZS5AdGhlbi5AY2FsbChAUHJvbWlzZS5AcmVzb2x2ZShyZXN1bHQpLCBmdW5j dGlvbigpIHsKICAgICAgICAgX3RoaXMuQHN0YXJ0ZWQgPSB0cnVlOwogICAgICAgICBAcmVxdWVz dFJlYWRhYmxlU3RyZWFtUHVsbChfdGhpcyk7CiAgICAgfSwgZnVuY3Rpb24oZXJyb3IpIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbUlu dGVybmFscy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVh bUludGVybmFscy5qcwppbmRleCA3Nzc4M2E2NjQ5ZmZmODk1ZTc3OTQ2MzRiOWE5ZTNiOTA1N2Rj NmI0Li45YjI2MDgwOTdkNzljOWM5OWY2N2Q4MDNiYmVjZjIyZmMyZTUyNzBkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1JbnRlcm5hbHMu anMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtSW50 ZXJuYWxzLmpzCkBAIC0xMDYsNyArMTA2LDcgQEAgZnVuY3Rpb24gdGVlUmVhZGFibGVTdHJlYW0o c3RyZWFtLCBzaG91bGRDbG9uZSkKICAgICBsZXQgYnJhbmNoMSA9IG5ldyBSZWFkYWJsZVN0cmVh bSh1bmRlcmx5aW5nU291cmNlMSk7CiAgICAgbGV0IGJyYW5jaDIgPSBuZXcgUmVhZGFibGVTdHJl YW0odW5kZXJseWluZ1NvdXJjZTIpOwogCi0gICAgcmVhZGVyLmNsb3NlZC5AY2F0Y2goZnVuY3Rp b24oZSkgeworICAgIEBQcm9taXNlLnByb3RvdHlwZS5AY2F0Y2guQGNhbGwocmVhZGVyLmNsb3Nl ZCwgZnVuY3Rpb24oZSkgewogICAgICAgICBpZiAodGVlU3RhdGUuY2xvc2VkT3JFcnJvcmVkKQog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBAZXJyb3JSZWFkYWJsZVN0cmVhbShicmFuY2gx LCBlKTsKQEAgLTEyNCw3ICsxMjQsNyBAQCBmdW5jdGlvbiB0ZWVSZWFkYWJsZVN0cmVhbShzdHJl YW0sIHNob3VsZENsb25lKQogZnVuY3Rpb24gdGVlUmVhZGFibGVTdHJlYW1QdWxsRnVuY3Rpb24o dGVlU3RhdGUsIHJlYWRlciwgc2hvdWxkQ2xvbmUpCiB7CiAgICAgcmV0dXJuIGZ1bmN0aW9uKCkg ewotICAgICAgICByZWFkZXIucmVhZCgpLkB0aGVuKGZ1bmN0aW9uKHJlc3VsdCkgeworICAgICAg ICBAUHJvbWlzZS5wcm90b3R5cGUuQHRoZW4uQGNhbGwocmVhZGVyLnJlYWQoKSwgZnVuY3Rpb24o cmVzdWx0KSB7CiAgICAgICAgICAgICBpZiAocmVzdWx0LmRvbmUgJiYgIXRlZVN0YXRlLmNsb3Nl ZE9yRXJyb3JlZCkgewogICAgICAgICAgICAgICAgIEBjbG9zZVJlYWRhYmxlU3RyZWFtKHRlZVN0 YXRlLmJyYW5jaDEpOwogICAgICAgICAgICAgICAgIEBjbG9zZVJlYWRhYmxlU3RyZWFtKHRlZVN0 YXRlLmJyYW5jaDIpOwpAQCAtMTUwLDggKzE1MCw5IEBAIGZ1bmN0aW9uIHRlZVJlYWRhYmxlU3Ry ZWFtQnJhbmNoMUNhbmNlbEZ1bmN0aW9uKHRlZVN0YXRlLCBzdHJlYW0pCiAgICAgICAgIHRlZVN0 YXRlLmNhbmNlbGVkMSA9IHRydWU7CiAgICAgICAgIHRlZVN0YXRlLnJlYXNvbjEgPSByOwogICAg ICAgICBpZiAodGVlU3RhdGUuY2FuY2VsZWQyKSB7Ci0gICAgICAgICAgICBAY2FuY2VsUmVhZGFi bGVTdHJlYW0oc3RyZWFtLCBbdGVlU3RhdGUucmVhc29uMSwgdGVlU3RhdGUucmVhc29uMl0pLnRo ZW4odGVlU3RhdGUuY2FuY2VsUHJvbWlzZUNhcGFiaWxpdHkuQHJlc29sdmUsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdGVlU3RhdGUuY2FuY2VsUHJvbWlzZUNhcGFiaWxpdHkuQHJlamVj dCk7CisgICAgICAgICAgICBAUHJvbWlzZS5wcm90b3R5cGUuQHRoZW4uQGNhbGwoQGNhbmNlbFJl YWRhYmxlU3RyZWFtKHN0cmVhbSwgW3RlZVN0YXRlLnJlYXNvbjEsIHRlZVN0YXRlLnJlYXNvbjJd KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZWVTdGF0ZS5j YW5jZWxQcm9taXNlQ2FwYWJpbGl0eS5AcmVzb2x2ZSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB0ZWVTdGF0ZS5jYW5jZWxQcm9taXNlQ2FwYWJpbGl0eS5AcmVq ZWN0KTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gdGVlU3RhdGUuY2FuY2VsUHJvbWlzZUNh cGFiaWxpdHkuQHByb21pc2U7CiAgICAgfQpAQCAtMTYzLDggKzE2NCw5IEBAIGZ1bmN0aW9uIHRl ZVJlYWRhYmxlU3RyZWFtQnJhbmNoMkNhbmNlbEZ1bmN0aW9uKHRlZVN0YXRlLCBzdHJlYW0pCiAg ICAgICAgIHRlZVN0YXRlLmNhbmNlbGVkMiA9IHRydWU7CiAgICAgICAgIHRlZVN0YXRlLnJlYXNv bjIgPSByOwogICAgICAgICBpZiAodGVlU3RhdGUuY2FuY2VsZWQxKSB7Ci0gICAgICAgICAgICBA Y2FuY2VsUmVhZGFibGVTdHJlYW0oc3RyZWFtLCBbdGVlU3RhdGUucmVhc29uMSwgdGVlU3RhdGUu cmVhc29uMl0pLnRoZW4odGVlU3RhdGUuY2FuY2VsUHJvbWlzZUNhcGFiaWxpdHkuQHJlc29sdmUs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGVlU3RhdGUuY2FuY2VsUHJvbWlzZUNhcGFi aWxpdHkuQHJlamVjdCk7CisgICAgICAgICAgICBAUHJvbWlzZS5wcm90b3R5cGUuQHRoZW4uQGNh bGwoQGNhbmNlbFJlYWRhYmxlU3RyZWFtKHN0cmVhbSwgW3RlZVN0YXRlLnJlYXNvbjEsIHRlZVN0 YXRlLnJlYXNvbjJdKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB0ZWVTdGF0ZS5jYW5jZWxQcm9taXNlQ2FwYWJpbGl0eS5AcmVzb2x2ZSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZWVTdGF0ZS5jYW5jZWxQcm9taXNlQ2Fw YWJpbGl0eS5AcmVqZWN0KTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gdGVlU3RhdGUuY2Fu Y2VsUHJvbWlzZUNhcGFiaWxpdHkuQHByb21pc2U7CiAgICAgfQpAQCAtMjM3LDcgKzIzOSw3IEBA IGZ1bmN0aW9uIHJlcXVlc3RSZWFkYWJsZVN0cmVhbVB1bGwoc3RyZWFtKQogICAgIHN0cmVhbS5A cHVsbGluZyA9IHRydWU7CiAKICAgICB2YXIgcHJvbWlzZSA9IEBwcm9taXNlSW52b2tlT3JOb29w KHN0cmVhbS5AdW5kZXJseWluZ1NvdXJjZSwgInB1bGwiLCBbc3RyZWFtLkBjb250cm9sbGVyXSk7 Ci0gICAgcHJvbWlzZS5AdGhlbihmdW5jdGlvbigpIHsKKyAgICBAUHJvbWlzZS5wcm90b3R5cGUu QHRoZW4uQGNhbGwocHJvbWlzZSwgZnVuY3Rpb24oKSB7CiAgICAgICAgIHN0cmVhbS5AcHVsbGlu ZyA9IGZhbHNlOwogICAgICAgICBpZiAoc3RyZWFtLkBwdWxsQWdhaW4pIHsKICAgICAgICAgICAg IHN0cmVhbS5AcHVsbEFnYWluID0gZmFsc2U7CkBAIC0yODEsNyArMjgzLDcgQEAgZnVuY3Rpb24g Y2FuY2VsUmVhZGFibGVTdHJlYW0oc3RyZWFtLCByZWFzb24pCiAgICAgICAgIHJldHVybiBAUHJv bWlzZS5AcmVqZWN0KHN0cmVhbS5Ac3RvcmVkRXJyb3IpOwogICAgIHN0cmVhbS5AcXVldWUgPSBA bmV3UXVldWUoKTsKICAgICBAZmluaXNoQ2xvc2luZ1JlYWRhYmxlU3RyZWFtKHN0cmVhbSk7Ci0g ICAgcmV0dXJuIEBwcm9taXNlSW52b2tlT3JOb29wKHN0cmVhbS5AdW5kZXJseWluZ1NvdXJjZSwg ImNhbmNlbCIsIFtyZWFzb25dKS5AdGhlbihmdW5jdGlvbigpIHsgfSk7CisgICAgcmV0dXJuIEBQ cm9taXNlLnByb3RvdHlwZS5AdGhlbi5AY2FsbChAcHJvbWlzZUludm9rZU9yTm9vcChzdHJlYW0u QHVuZGVybHlpbmdTb3VyY2UsICJjYW5jZWwiLCBbcmVhc29uXSksIGZ1bmN0aW9uKCkgeyB9KTsK IH0KIAogZnVuY3Rpb24gZmluaXNoQ2xvc2luZ1JlYWRhYmxlU3RyZWFtKHN0cmVhbSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVhbS5qcyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVhbS5qcwppbmRleCBl YWM5NTZjMWUxNjE2Mzc5NzVhZmI5YTE2ODU3MDliZWE1ZDFkMDg1Li5mNTVmZTdkNmY2MWQxMjcw Y2ZlNGYwZDQ3NWU4NDViYTZjMjlkZmI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL3N0cmVhbXMvV3JpdGFibGVTdHJlYW0uanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9zdHJlYW1zL1dyaXRhYmxlU3RyZWFtLmpzCkBAIC01Nyw3ICs1Nyw3IEBAIGZ1bmN0aW9uIGlu aXRpYWxpemVXcml0YWJsZVN0cmVhbSh1bmRlcmx5aW5nU2luaywgc3RyYXRlZ3kpCiAgICAgdmFy IHN0YXJ0UmVzdWx0ID0gQGludm9rZU9yTm9vcCh1bmRlcmx5aW5nU2luaywgInN0YXJ0IiwgW2Vy cm9yXSk7CiAgICAgdGhpcy5Ac3RhcnRlZFByb21pc2UgPSBAUHJvbWlzZS5AcmVzb2x2ZShzdGFy dFJlc3VsdCk7CiAgICAgdmFyIF90aGlzID0gdGhpczsKLSAgICB0aGlzLkBzdGFydGVkUHJvbWlz ZS5AdGhlbihmdW5jdGlvbigpIHsKKyAgICBAUHJvbWlzZS5wcm90b3R5cGUuQHRoZW4uQGNhbGwo dGhpcy5Ac3RhcnRlZFByb21pc2UsIGZ1bmN0aW9uKCkgewogICAgICAgICBfdGhpcy5Ac3RhcnRl ZCA9IHRydWU7CiAgICAgICAgIF90aGlzLkBzdGFydGVkUHJvbWlzZSA9IHVuZGVmaW5lZDsKICAg ICB9LCBlcnJvcik7CkBAIC04Miw3ICs4Miw3IEBAIGZ1bmN0aW9uIGFib3J0KHJlYXNvbikKIAog ICAgIGNvbnN0IHNpbmtBYm9ydFByb21pc2UgPSBAcHJvbWlzZUludm9rZU9yRmFsbGJhY2tPck5v b3AodGhpcy5AdW5kZXJseWluZ1NpbmssICJhYm9ydCIsIFtyZWFzb25dLCAiY2xvc2UiLCBbXSk7 CiAKLSAgICByZXR1cm4gc2lua0Fib3J0UHJvbWlzZS5AdGhlbihmdW5jdGlvbigpIHsgcmV0dXJu IHVuZGVmaW5lZDsgfSk7CisgICAgcmV0dXJuIEBQcm9taXNlLnByb3RvdHlwZS5AdGhlbi5AY2Fs bChzaW5rQWJvcnRQcm9taXNlLCBmdW5jdGlvbigpIHsgcmV0dXJuIHVuZGVmaW5lZDsgfSk7CiB9 CiAKIGZ1bmN0aW9uIGNsb3NlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv c3RyZWFtcy9Xcml0YWJsZVN0cmVhbUludGVybmFscy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvc3RyZWFtcy9Xcml0YWJsZVN0cmVhbUludGVybmFscy5qcwppbmRleCA5Y2QzNGE1Yzc5Yzgx MjU0YWRlMWY2Y2Y0YmViODRmYTkzMWJiYmIzLi5iNTdlYmFmZTE1ZTMzYzFkMDYyNDY2NmQ4ZjMx M2FlYmNjZTExMDlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMv V3JpdGFibGVTdHJlYW1JbnRlcm5hbHMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9z dHJlYW1zL1dyaXRhYmxlU3RyZWFtSW50ZXJuYWxzLmpzCkBAIC03Niw3ICs3Niw3IEBAIGZ1bmN0 aW9uIGVycm9yV3JpdGFibGVTdHJlYW0oZSkKIGZ1bmN0aW9uIGNhbGxPclNjaGVkdWxlV3JpdGFi bGVTdHJlYW1BZHZhbmNlUXVldWUoc3RyZWFtKQogewogICAgIGlmICghc3RyZWFtLkBzdGFydGVk KQotICAgICAgICBzdHJlYW0uQHN0YXJ0ZWRQcm9taXNlLkB0aGVuKGZ1bmN0aW9uKCkgeyBAd3Jp dGFibGVTdHJlYW1BZHZhbmNlUXVldWUoc3RyZWFtKTsgfSk7CisgICAgICAgIEBQcm9taXNlLnBy b3RvdHlwZS5AdGhlbi5AY2FsbChzdHJlYW0uQHN0YXJ0ZWRQcm9taXNlLCBmdW5jdGlvbigpIHsg QHdyaXRhYmxlU3RyZWFtQWR2YW5jZVF1ZXVlKHN0cmVhbSk7IH0pOwogICAgIGVsc2UKICAgICAg ICAgQHdyaXRhYmxlU3RyZWFtQWR2YW5jZVF1ZXVlKHN0cmVhbSk7CiAKQEAgLTk4LDcgKzk4LDcg QEAgZnVuY3Rpb24gd3JpdGFibGVTdHJlYW1BZHZhbmNlUXVldWUoc3RyZWFtKQogICAgIH0KIAog ICAgIHN0cmVhbS5Ad3JpdGluZyA9IHRydWU7Ci0gICAgQHByb21pc2VJbnZva2VPck5vb3Aoc3Ry ZWFtLkB1bmRlcmx5aW5nU2luaywgIndyaXRlIiwgW3dyaXRlUmVjb3JkLmNodW5rXSkuQHRoZW4o CisgICAgQFByb21pc2UucHJvdG90eXBlLkB0aGVuLkBjYWxsKEBwcm9taXNlSW52b2tlT3JOb29w KHN0cmVhbS5AdW5kZXJseWluZ1NpbmssICJ3cml0ZSIsIFt3cml0ZVJlY29yZC5jaHVua10pLAog ICAgICAgICBmdW5jdGlvbigpIHsKICAgICAgICAgICAgIGlmIChzdHJlYW0uQHN0YXRlID09PSBA c3RyZWFtRXJyb3JlZCkKICAgICAgICAgICAgICAgICByZXR1cm47CkBAIC0xMTksNyArMTE5LDcg QEAgZnVuY3Rpb24gd3JpdGFibGVTdHJlYW1BZHZhbmNlUXVldWUoc3RyZWFtKQogZnVuY3Rpb24g Y2xvc2VXcml0YWJsZVN0cmVhbShzdHJlYW0pCiB7CiAgICAgQGFzc2VydChzdHJlYW0uQHN0YXRl ID09PSBAc3RyZWFtQ2xvc2luZyk7Ci0gICAgQHByb21pc2VJbnZva2VPck5vb3Aoc3RyZWFtLkB1 bmRlcmx5aW5nU2luaywgImNsb3NlIikuQHRoZW4oCisgICAgQFByb21pc2UucHJvdG90eXBlLkB0 aGVuLkBjYWxsKEBwcm9taXNlSW52b2tlT3JOb29wKHN0cmVhbS5AdW5kZXJseWluZ1NpbmssICJj bG9zZSIpLAogICAgICAgICBmdW5jdGlvbigpIHsKICAgICAgICAgICAgIGlmIChzdHJlYW0uQHN0 YXRlID09PSBAc3RyZWFtRXJyb3JlZCkKICAgICAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg YzEwMjE0ODA5MTgxNTdjNjYyMjkxMzFhNjJhOGU1MjY0ZjEzYzRiMS4uNjNlZGUyN2ZkOWE3MDc0 ZTUzZmZkMDY1OGI2NWJhNjY3NWZiNWRiYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE1LTEx LTA5ICBYYWJpZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAg ICAgICAgW1N0cmVhbXMgQVBJXSBTaGllbGQgcHJvbWlzZXMgd2hlbiBwcm90b3R5cGUgaXMgcmVw bGFjZWQgZnJvbSBhIHByb21pc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1MTAzMworCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgor CisgICAgICAgICogc3RyZWFtcy9zdHJlYW1zLXByb21pc2VzLWV4cGVjdGVkLnR4dDogVXBkYXRl ZCBleHBlY3RhdGlvbnMuCisKIDIwMTUtMTEtMDkgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2Fib3Vo YWxsYXdhQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMTkwODgzKTogRXJyb3Ig Y2FsY3VsYXRpbmcgdGhlIHRpbGUgc2l6ZSBmb3IgYW4gU1ZHIHdpdGggbm8gaW50cmluc2ljIHNp emUgYnV0IHdpdGggbGFyZ2UgZmxvYXRpbmcgaW50cmluc2ljIHJhdGlvCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9zdHJlYW1zL3N0cmVhbXMtcHJvbWlzZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvc3RyZWFtcy9zdHJlYW1zLXByb21pc2VzLWV4cGVjdGVkLnR4dAppbmRleCBmM2ZjZTQ4 NGQyZWQ1ZDhmOTNkYTcwNTVhNWU1YTVjMTJlYmYzNGJiLi40ZDYxZTRhODNiOTg5ZmYyZGYwNTA0 MmU2NzNiNmU1OGVmMTRlNTE0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9zdHJlYW1zL3N0cmVh bXMtcHJvbWlzZXMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3N0cmVhbXMvc3RyZWFt cy1wcm9taXNlcy1leHBlY3RlZC50eHQKQEAgLTIsNyArMiw3IEBACiBQQVNTIFN0cmVhbXMgYW5k IHByb21pc2VzOiByZXBsYWNlIFByb21pc2UgY29uc3RydWN0b3IgCiBQQVNTIFN0cmVhbXMgYW5k IHByb21pc2VzOiByZXBsYWNlIFByb21pc2UucmVzb2x2ZSAKIFBBU1MgU3RyZWFtcyBhbmQgcHJv bWlzZXM6IHJlcGxhY2UgUHJvbWlzZS5yZWplY3QgCi1GQUlMIFN0cmVhbXMgYW5kIHByb21pc2Vz OiByZXBsYWNlIHByb3RvdHlwZSBvZiBhIHByb21pc2Ugb2JqZWN0IHVuZGVmaW5lZCBpcyBub3Qg YSBmdW5jdGlvbgorUEFTUyBTdHJlYW1zIGFuZCBwcm9taXNlczogcmVwbGFjZSBwcm90b3R5cGUg b2YgYSBwcm9taXNlIG9iamVjdCAKIFBBU1MgU3RyZWFtcyBhbmQgcHJvbWlzZXM6IHJlcGxhY2Ug dGhlbiBtZXRob2QgaW4gUHJvbWlzZSBwcm90b3R5cGUgCiBQQVNTIFN0cmVhbXMgYW5kIHByb21p c2VzOiByZXBsYWNlIGNhdGNoIG1ldGhvZCBpbiBQcm9taXNlIHByb3RvdHlwZSAKIFBBU1MgU3Ry ZWFtcyBhbmQgcHJvbWlzZXM6IHJlcGxhY2UgdGhlbiBtZXRob2QgaW4gcHJvbWlzZSBvYmplY3Qg Cg==