29039 2009-09-08 10:39:13 -0700 Option for creating a new style rule should move under the gear menu 2009-09-10 20:17:52 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 timothy timothy joepeck timothy oldest_to_newest 145437 0 timothy 2009-09-08 10:39:13 -0700 Currently to create a new style rule you double click on the section that say "Double-click to…". This isn't the best UI, but was all we had when it was added. We can now put an item under the gear menu. 145451 1 39196 timothy 2009-09-08 10:57:21 -0700 Created attachment 39196 Proposed Patch 146443 2 timothy 2009-09-10 20:17:52 -0700 Committed r48281: <http://trac.webkit.org/changeset/48281> 39196 2009-09-08 10:57:21 -0700 2009-09-10 20:05:02 -0700 Proposed Patch bug-29039-20090908105719.patch text/plain 18763 timothy ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjBjYjdmMC4uYTI5NWM3MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MCBAQAorMjAwOS0wOS0wOCAgVGltb3RoeSBIYXRj aGVyICA8dGltb3RoeUBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTW92ZSB0 aGUgb3B0aW9uIHRvIGNyZWF0ZSBhIG5ldyBzdHlsZSBydWxlIHVuZGVyIHRoZSBTdHlsZXMnIGdl YXIgbWVudS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjkwMzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUpOiBBZGQgIk5ldyBTdHlsZSBSdWxlIiBvcHRp b24gdG8gdGhlIGdlYXIgbWVudS4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFy UGFuZS5wcm90b3R5cGUuX3VwZGF0ZSk6IENoZWNrIGluc3RhbmNlb2YgQmxhbmtTdHlsZVByb3Bl cnRpZXNTZWN0aW9uIGluc3RlYWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJh clBhbmUucHJvdG90eXBlLl9jaGFuZ2VTZXR0aW5nKTogQWRkZWQuIEtlZXBzIHRoZSBjb2xvciBm b3JtYXQgc2V0dGluZyBzZWxlY3RlZAorICAgICAgICB3aGlsZSBjYWxsaW5nIHRoZSBjb3JyZWN0 IGFjdGlvbi4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5 cGUuX2NyZWF0ZU5ld1J1bGUpOiBDcmVhdGVzIGEgbmV3IHNlY3Rpb24gYW5kIGVkaXRzIHRoZSBz ZWxlY3Rvci4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5 cGUuYWRkQmxhbmtTZWN0aW9uKTogSW5zZXJ0IHRoZSBzZWN0aW9uIGluIGEgY2xlYW5lciB3YXku CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBlLnJlbW92 ZVNlY3Rpb24pOiBBZGRlZC4gUmVtb3ZlcyB0aGUgcGFzc2VkIGluIHNlY3Rpb24uCisgICAgICAg IChXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBlLmFwcHJvcHJpYXRlU2Vs ZWN0b3JGb3JOb2RlKTogUmV0dXJuIGFuIGVtcHR5IHN0cmluZyBpZiB0aGVyZSBpcyBubyBub2Rl LgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBl LmV4cGFuZCk6IFJlbW92ZWQgdGhlIGNoZWNrIGZvciBfYmxhbmsuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuc3RhcnRFZGl0aW5nU2VsZWN0 b3IpOiBObyBuZWVkIGZvciB0aGUgY29udGV4dCwgdGhlIG9yaWdpbmFsIHNlbGVjdG9yCisgICAg ICAgIGlzIHJlbWVtYmVyZWQgYnkgdGhlIGVkaXRpbmcgY29kZS4KKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5lZGl0aW5nU2VsZWN0b3JDYW5j ZWxsZWQpOiBEbyBub3RoaW5nLiBUaGUgb3JpZ2luYWwgdGV4dCBpcyBhbHJlYWR5CisgICAgICAg IHJlc3RvcmVkIGJ5IHRoZSBlZGl0aW5nIGNvZGUuCisgICAgICAgIChXZWJJbnNwZWN0b3IuQmxh bmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uKTogQ2FsbCB0aGUgU3R5bGVQcm9wZXJ0aWVzU2VjdGlv biBjb25zdHJ1Y3RvciB3aXRoIGFwcHJvcHJpYXRlIGRhdGEuCisgICAgICAgIFJlbW92ZSBldmVu dCBsaXN0ZW5lciBjb2RlLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0 aWVzU2VjdGlvbi5wcm90b3R5cGUuZXhwYW5kKTogQWRkZWQuIERvZXMgbm90aGluZyB0byBwcmV2 ZW50IGV4cGFuZGluZy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGll c1NlY3Rpb24ucHJvdG90eXBlLmVkaXRpbmdTZWxlY3RvckNvbW1pdHRlZC5jYWxsYmFjayk6IENv cnJlY3RseSBjb25zdHJ1Y3QgdGhlCisgICAgICAgIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xh cmF0aW9uLiBDYWxsIGVkaXRpbmdTZWxlY3RvckNhbmNlbGxlZCBpbnN0ZWFkIG9mIGVkaXRpbmdD YW5jZWxsZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0 aW9uLnByb3RvdHlwZS5lZGl0aW5nU2VsZWN0b3JDb21taXR0ZWQpOiBSZW5hbWVkIGZyb20gZWRp dGluZ0NvbW1pdHRlZCB0bworICAgICAgICBvdmVycmlkZSB0aGUgYmFzZSBjbGFzcy4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVk aXRpbmdTZWxlY3RvckNhbmNlbGxlZCk6IFJlbW92ZSB0aGUgc2VjdGlvbi4KKyAgICAgICAgKFdl Ykluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLm1ha2VOb3Jt YWwpOiBSZW1vdmVkIGV2ZW50IGxpc3RlbmVyIGNvZGUuIFJlbW92ZWQgdGhlIGRlbGV0ZSBsaW5l cworICAgICAgICBzaW5jZSB0aGV5IHdlcmUgZG9pbmcgbm90aGluZyAoZGVsZXRpbmcgbm9uZXhp c3RlbnQgcHJvcGVydGllcyB0aGF0IGV4aXN0IG9ubHkgb24gdGhlIHByb3RvdHlwZS4pIENoYW5n ZSBwcm90b3R5cGVzIGF0CisgICAgICAgIHRoZSBlbmQgdG8gY29ycmVjdGx5IHN3dGljaCB0byBh IHJlYWwgU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi4KKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5zdGFydEVkaXRpbmcuZWRp dGluZ0NhbmNlbGxlZCk6IENlY2sgZm9yIG51bGwvdW5kZWZpbmVkIGNhbGxiYWNrcy4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5zdGFydEVkaXRpbmcuZWRpdGluZ0NvbW1pdHRlZCk6IERpdHRvLgor CiAyMDA5LTA5LTA2ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAogICAg ICAgICBBZGRzIGEgcGVyc2lzdGVudCBzZXR0aW5nIGZvciBjb2xvciBmb3JtYXQgaW4gdGhlIFdl YiBJbnNwZWN0b3IuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5 bGVzU2lkZWJhclBhbmUuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lk ZWJhclBhbmUuanMKaW5kZXggNTI2YzI0ZC4uNDU1MWFkNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCisrKyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwpAQCAtMzUsNiArMzUsNyBAQCBX ZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUgPSBmdW5jdGlvbigpCiAKICAgICB2YXIgb3B0 aW9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib3B0aW9uIik7CiAgICAgb3B0aW9uLnZhbHVl ID0gImhleCI7CisgICAgb3B0aW9uLmFjdGlvbiA9IHRoaXMuX2NoYW5nZUNvbG9yRm9ybWF0LmJp bmQodGhpcyk7CiAgICAgaWYgKFByZWZlcmVuY2VzLmNvbG9yRm9ybWF0ID09PSAiaGV4IikKICAg ICAgICAgb3B0aW9uLnNlbGVjdGVkID0gdHJ1ZTsKICAgICBvcHRpb24ubGFiZWwgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIkhleCBDb2xvcnMiKTsKQEAgLTQyLDYgKzQzLDcgQEAgV2ViSW5zcGVj dG9yLlN0eWxlc1NpZGViYXJQYW5lID0gZnVuY3Rpb24oKQogCiAgICAgb3B0aW9uID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgib3B0aW9uIik7CiAgICAgb3B0aW9uLnZhbHVlID0gInJnYiI7Cisg ICAgb3B0aW9uLmFjdGlvbiA9IHRoaXMuX2NoYW5nZUNvbG9yRm9ybWF0LmJpbmQodGhpcyk7CiAg ICAgaWYgKFByZWZlcmVuY2VzLmNvbG9yRm9ybWF0ID09PSAicmdiIikKICAgICAgICAgb3B0aW9u LnNlbGVjdGVkID0gdHJ1ZTsKICAgICBvcHRpb24ubGFiZWwgPSBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIlJHQiBDb2xvcnMiKTsKQEAgLTQ5LDEzICs1MSwyMSBAQCBXZWJJbnNwZWN0b3IuU3R5bGVz U2lkZWJhclBhbmUgPSBmdW5jdGlvbigpCiAKICAgICBvcHRpb24gPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJvcHRpb24iKTsKICAgICBvcHRpb24udmFsdWUgPSAiaHNsIjsKKyAgICBvcHRpb24u YWN0aW9uID0gdGhpcy5fY2hhbmdlQ29sb3JGb3JtYXQuYmluZCh0aGlzKTsKICAgICBpZiAoUHJl ZmVyZW5jZXMuY29sb3JGb3JtYXQgPT09ICJoc2wiKQogICAgICAgICBvcHRpb24uc2VsZWN0ZWQg PSB0cnVlOwogICAgIG9wdGlvbi5sYWJlbCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiSFNMIENv bG9ycyIpOwogICAgIHRoaXMuc2V0dGluZ3NTZWxlY3RFbGVtZW50LmFwcGVuZENoaWxkKG9wdGlv bik7CiAKKyAgICB0aGlzLnNldHRpbmdzU2VsZWN0RWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJociIpKTsKKworICAgIG9wdGlvbiA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoIm9wdGlvbiIpOworICAgIG9wdGlvbi5hY3Rpb24gPSB0aGlzLl9jcmVhdGVOZXdSdWxl LmJpbmQodGhpcyk7CisgICAgb3B0aW9uLmxhYmVsID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJO ZXcgU3R5bGUgUnVsZSIpOworICAgIHRoaXMuc2V0dGluZ3NTZWxlY3RFbGVtZW50LmFwcGVuZENo aWxkKG9wdGlvbik7CisKICAgICB0aGlzLnNldHRpbmdzU2VsZWN0RWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCJjbGljayIsIGZ1bmN0aW9uKGV2ZW50KSB7IGV2ZW50LnN0b3BQcm9wYWdhdGlvbigp IH0sIGZhbHNlKTsKLSAgICB0aGlzLnNldHRpbmdzU2VsZWN0RWxlbWVudC5hZGRFdmVudExpc3Rl bmVyKCJjaGFuZ2UiLCB0aGlzLl9jaGFuZ2VDb2xvckZvcm1hdC5iaW5kKHRoaXMpLCBmYWxzZSk7 CisgICAgdGhpcy5zZXR0aW5nc1NlbGVjdEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2hhbmdl IiwgdGhpcy5fY2hhbmdlU2V0dGluZy5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAgICB0aGlzLnRp dGxlRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLnNldHRpbmdzU2VsZWN0RWxlbWVudCk7CiB9CkBA IC05MiwxMiArMTAyLDE0IEBAIFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdmFyIHNlbGYgPSB0aGlzOwot ICAgICAgICB2YXIgY2FsbGJhY2sgPSBmdW5jdGlvbihzdHlsZXMpIHsKKyAgICAgICAgZnVuY3Rp b24gY2FsbGJhY2soc3R5bGVzKQorICAgICAgICB7CiAgICAgICAgICAgICBpZiAoIXN0eWxlcykK ICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICBub2RlLl9zZXRTdHlsZXMoc3R5 bGVzLmNvbXB1dGVkU3R5bGUsIHN0eWxlcy5pbmxpbmVTdHlsZSwgc3R5bGVzLnN0eWxlQXR0cmli dXRlcywgc3R5bGVzLm1hdGNoZWRDU1NSdWxlcyk7CiAgICAgICAgICAgICBzZWxmLl91cGRhdGUo cmVmcmVzaCwgYm9keSwgbm9kZSwgZWRpdGVkU2VjdGlvbiwgZm9yY2VVcGRhdGUpOwotICAgICAg ICB9OworICAgICAgICB9CisKICAgICAgICAgSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuZ2V0U3R5bGVz KG5vZGUuaWQsICFQcmVmZXJlbmNlcy5zaG93VXNlckFnZW50U3R5bGVzLCBjYWxsYmFjayk7CiAg ICAgfSwKIApAQCAtMTEzLDcgKzEyNSw3IEBAIFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFu ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChyZWZyZXNoKSB7CiAgICAgICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHRoaXMuc2VjdGlvbnMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAg ICAgICB2YXIgc2VjdGlvbiA9IHRoaXMuc2VjdGlvbnNbaV07Ci0gICAgICAgICAgICAgICAgaWYg KHNlY3Rpb24uX2JsYW5rKQorICAgICAgICAgICAgICAgIGlmIChzZWN0aW9uIGluc3RhbmNlb2Yg V2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbikKICAgICAgICAgICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgICAgICAgICAgaWYgKHNlY3Rpb24uY29tcHV0ZWRTdHls ZSkKICAgICAgICAgICAgICAgICAgICAgc2VjdGlvbi5zdHlsZVJ1bGUuc3R5bGUgPSBub2RlLm93 bmVyRG9jdW1lbnQuZGVmYXVsdFZpZXcuZ2V0Q29tcHV0ZWRTdHlsZShub2RlKTsKQEAgLTI5Nyw5 ICszMDksMjUgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgICAgICBib2R5LmFwcGVuZENoaWxkKHNlY3Rpb24uZWxlbWVudCk7CiAgICAg ICAgICAgICAgICAgdGhpcy5zZWN0aW9ucy5wdXNoKHNlY3Rpb24pOwogICAgICAgICAgICAgfQor ICAgICAgICB9CisgICAgfSwKIAotICAgICAgICAgICAgdGhpcy5hZGRCbGFua1NlY3Rpb24oKTsK KyAgICBfY2hhbmdlU2V0dGluZzogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIg b3B0aW9ucyA9IHRoaXMuc2V0dGluZ3NTZWxlY3RFbGVtZW50Lm9wdGlvbnM7CisgICAgICAgIHZh ciBzZWxlY3RlZE9wdGlvbiA9IG9wdGlvbnNbdGhpcy5zZXR0aW5nc1NlbGVjdEVsZW1lbnQuc2Vs ZWN0ZWRJbmRleF07CisgICAgICAgIHNlbGVjdGVkT3B0aW9uLmFjdGlvbihldmVudCk7CisKKyAg ICAgICAgLy8gU2VsZWN0IHRoZSBjb3JyZWN0IGNvbG9yIGZvcm1hdCBzZXR0aW5nIGFnYWluLCBz aW5jZSBpdCBuZWVkcyB0byBiZSBzZWxlY3RlZC4KKyAgICAgICAgdmFyIHNlbGVjdGVkSW5kZXgg PSAwOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG9wdGlvbnMubGVuZ3RoOyArK2kpIHsK KyAgICAgICAgICAgIGlmIChvcHRpb25zW2ldLnZhbHVlID09PSBQcmVmZXJlbmNlcy5jb2xvckZv cm1hdCkgeworICAgICAgICAgICAgICAgIHNlbGVjdGVkSW5kZXggPSBpOworICAgICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgICAgfQogICAgICAgICB9CisKKyAgICAgICAgdGhpcy5zZXR0 aW5nc1NlbGVjdEVsZW1lbnQuc2VsZWN0ZWRJbmRleCA9IHNlbGVjdGVkSW5kZXg7CiAgICAgfSwK IAogICAgIF9jaGFuZ2VDb2xvckZvcm1hdDogZnVuY3Rpb24oZXZlbnQpCkBAIC0zMTMsMjQgKzM0 MSwzOSBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAg ICAgICAgICAgdGhpcy5zZWN0aW9uc1tpXS51cGRhdGUodHJ1ZSk7CiAgICAgfSwKIAorICAgIF9j cmVhdGVOZXdSdWxlOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuYWRkQmxh bmtTZWN0aW9uKCkuc3RhcnRFZGl0aW5nU2VsZWN0b3IoKTsKKyAgICB9LAorCiAgICAgYWRkQmxh bmtTZWN0aW9uOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB2YXIgYmxhbmtTZWN0aW9uID0g bmV3IFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24oKTsKKyAgICAgICAg dmFyIGJsYW5rU2VjdGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNT ZWN0aW9uKHRoaXMuYXBwcm9wcmlhdGVTZWxlY3RvckZvck5vZGUoKSk7CiAgICAgICAgIGJsYW5r U2VjdGlvbi5wYW5lID0gdGhpczsKIAotICAgICAgICB0aGlzLmJvZHlFbGVtZW50Lmluc2VydEJl Zm9yZShibGFua1NlY3Rpb24uZWxlbWVudCwgdGhpcy5ib2R5RWxlbWVudC5maXJzdENoaWxkLm5l eHRTaWJsaW5nLm5leHRTaWJsaW5nKTsgLy8gMCBpcyBjb21wdXRlZCwgMSBpcyBlbGVtZW50LnN0 eWxlCi0gICAgICAgIHZhciBjb21wdXRlZCA9IHRoaXMuc2VjdGlvbnMuc2hpZnQoKTsKLSAgICAg ICAgdmFyIGVsZW1lbnRTdHlsZSA9IHRoaXMuc2VjdGlvbnMuc2hpZnQoKTsKLSAgICAgICAgdGhp cy5zZWN0aW9ucy51bnNoaWZ0KGJsYW5rU2VjdGlvbik7Ci0gICAgICAgIHRoaXMuc2VjdGlvbnMu dW5zaGlmdChlbGVtZW50U3R5bGUpOwotICAgICAgICB0aGlzLnNlY3Rpb25zLnVuc2hpZnQoY29t cHV0ZWQpOworICAgICAgICB2YXIgZWxlbWVudFN0eWxlU2VjdGlvbiA9IHRoaXMuc2VjdGlvbnNb MV07ICAgICAgICAKKyAgICAgICAgdGhpcy5ib2R5RWxlbWVudC5pbnNlcnRCZWZvcmUoYmxhbmtT ZWN0aW9uLmVsZW1lbnQsIGVsZW1lbnRTdHlsZVNlY3Rpb24uZWxlbWVudC5uZXh0U2libGluZyk7 CisKKyAgICAgICAgdGhpcy5zZWN0aW9ucy5zcGxpY2UoMiwgMCwgYmxhbmtTZWN0aW9uKTsKKwor ICAgICAgICByZXR1cm4gYmxhbmtTZWN0aW9uOworICAgIH0sCisKKyAgICByZW1vdmVTZWN0aW9u OiBmdW5jdGlvbihzZWN0aW9uKQorICAgIHsKKyAgICAgICAgdmFyIGluZGV4ID0gdGhpcy5zZWN0 aW9ucy5pbmRleE9mKHNlY3Rpb24pOworICAgICAgICBpZiAoaW5kZXggPT09IC0xKQorICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB0aGlzLnNlY3Rpb25zLnNwbGljZShpbmRleCwgMSk7Cisg ICAgICAgIGlmIChzZWN0aW9uLmVsZW1lbnQucGFyZW50Tm9kZSkKKyAgICAgICAgICAgIHNlY3Rp b24uZWxlbWVudC5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKHNlY3Rpb24uZWxlbWVudCk7CiAgICAg fSwKIAogICAgIGFwcHJvcHJpYXRlU2VsZWN0b3JGb3JOb2RlOiBmdW5jdGlvbigpCiAgICAgewog ICAgICAgICB2YXIgbm9kZSA9IHRoaXMubm9kZTsKICAgICAgICAgaWYgKCFub2RlKQotICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuICIiOwogCiAgICAgICAgIHZhciBpZCA9 IG5vZGUuZ2V0QXR0cmlidXRlKCJpZCIpOwogICAgICAgICBpZiAoaWQpCkBAIC0zNTMsNiArMzk2 LDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZS5fX3Byb3RvX18g PSBXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmUucHIKIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRp ZXNTZWN0aW9uID0gZnVuY3Rpb24oc3R5bGVSdWxlLCBzdWJ0aXRsZSwgY29tcHV0ZWRTdHlsZSwg dXNlZFByb3BlcnRpZXMsIGVkaXRhYmxlKQogewogICAgIFdlYkluc3BlY3Rvci5Qcm9wZXJ0aWVz U2VjdGlvbi5jYWxsKHRoaXMsIHN0eWxlUnVsZS5zZWxlY3RvclRleHQpOworCiAgICAgdGhpcy50 aXRsZUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCBmdW5jdGlvbihlKSB7IGUuc3Rv cFByb3BhZ2F0aW9uKCk7IH0sIGZhbHNlKTsKICAgICB0aGlzLnRpdGxlRWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJkYmxjbGljayIsIHRoaXMuX2RibGNsaWNrU2VsZWN0b3IuYmluZCh0aGlzKSwg ZmFsc2UpOwogICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkYmxjbGljayIsIHRo aXMuX2RibGNsaWNrRW1wdHlTcGFjZS5iaW5kKHRoaXMpLCBmYWxzZSk7CkBAIC00MzYsOSArNDgw LDYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewog CiAgICAgZXhwYW5kOiBmdW5jdGlvbihkb250UmVtZW1iZXJTdGF0ZSkKICAgICB7Ci0gICAgICAg IGlmICh0aGlzLl9ibGFuaykKLSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICBXZWJJbnNw ZWN0b3IuUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmV4cGFuZC5jYWxsKHRoaXMpOwogICAg ICAgICBpZiAoZG9udFJlbWVtYmVyU3RhdGUpCiAgICAgICAgICAgICByZXR1cm47CkBAIC02MDEs OCArNjQyLDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBl ID0gewogICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmlzQmVpbmdFZGl0ZWQoZWxlbWVudCkpCiAg ICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdmFyIGNvbnRleHQgPSB0aGlzLnN0eWxlUnVs ZS5zZWxlY3RvclRleHQ7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5zdGFydEVkaXRpbmcodGhpcy50 aXRsZUVsZW1lbnQsIHRoaXMuZWRpdGluZ1NlbGVjdG9yQ29tbWl0dGVkLmJpbmQodGhpcyksIHRo aXMuZWRpdGluZ1NlbGVjdG9yQ2FuY2VsbGVkLmJpbmQodGhpcyksIGNvbnRleHQpOworICAgICAg ICBXZWJJbnNwZWN0b3Iuc3RhcnRFZGl0aW5nKHRoaXMudGl0bGVFbGVtZW50LCB0aGlzLmVkaXRp bmdTZWxlY3RvckNvbW1pdHRlZC5iaW5kKHRoaXMpLCB0aGlzLmVkaXRpbmdTZWxlY3RvckNhbmNl bGxlZC5iaW5kKHRoaXMpLCBudWxsKTsKICAgICAgICAgd2luZG93LmdldFNlbGVjdGlvbigpLnNl dEJhc2VBbmRFeHRlbnQoZWxlbWVudCwgMCwgZWxlbWVudCwgMSk7CiAgICAgfSwKIApAQCAtNjI1 LDEwICs2NjUsMTAgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90 eXBlID0gewogICAgICAgICAgICAgcmV0dXJuIG1vdmVUb05leHRJZk5lZWRlZC5jYWxsKHRoaXMp OwogCiAgICAgICAgIHZhciBzZWxmID0gdGhpczsKLSAgICAgICAgdmFyIGNhbGxiYWNrID0gZnVu Y3Rpb24ocmVzdWx0KSB7CisgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKHJlc3VsdCkKKyAgICAg ICAgewogICAgICAgICAgICAgaWYgKCFyZXN1bHQpIHsKICAgICAgICAgICAgICAgICAvLyBJbnZh bGlkIFN5bnRheCBmb3IgYSBTZWxlY3RvcgotICAgICAgICAgICAgICAgIHNlbGYuZWRpdGluZ1Nl bGVjdG9yQ2FuY2VsbGVkKGVsZW1lbnQsIGNvbnRleHQpOwogICAgICAgICAgICAgICAgIG1vdmVU b05leHRJZk5lZWRlZC5jYWxsKHNlbGYpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgICAgIH0KQEAgLTY0Niw3MiArNjg2LDU5IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRp ZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZhciBuZXdSdWxlID0gV2ViSW5z cGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24ucGFyc2VSdWxlKG5ld1J1bGVQYXlsb2FkKTsKICAg ICAgICAgICAgIHNlbGYucnVsZSA9IG5ld1J1bGU7CiAgICAgICAgICAgICBzZWxmLnN0eWxlUnVs ZSA9IHsgc2VjdGlvbjogc2VsZiwgc3R5bGU6IG5ld1J1bGUuc3R5bGUsIHNlbGVjdG9yVGV4dDog bmV3UnVsZS5zZWxlY3RvclRleHQsIHBhcmVudFN0eWxlU2hlZXQ6IG5ld1J1bGUucGFyZW50U3R5 bGVTaGVldCwgcnVsZTogbmV3UnVsZSB9OworCiAgICAgICAgICAgICB2YXIgb2xkSWRlbnRpZmll ciA9IHRoaXMuaWRlbnRpZmllcjsKICAgICAgICAgICAgIHNlbGYuaWRlbnRpZmllciA9IG5ld1J1 bGUuc2VsZWN0b3JUZXh0ICsgIjoiICsgc2VsZi5zdWJ0aXRsZUVsZW1lbnQudGV4dENvbnRlbnQ7 CisKICAgICAgICAgICAgIHNlbGYucGFuZS51cGRhdGUoKTsKKwogICAgICAgICAgICAgV2ViSW5z cGVjdG9yLnBhbmVscy5lbGVtZW50cy5yZW5hbWVTZWxlY3RvcihvbGRJZGVudGlmaWVyLCB0aGlz LmlkZW50aWZpZXIsIG9sZENvbnRlbnQsIG5ld0NvbnRlbnQpOworCiAgICAgICAgICAgICBtb3Zl VG9OZXh0SWZOZWVkZWQuY2FsbChzZWxmKTsKLSAgICAgICAgfTsKKyAgICAgICAgfQogCiAgICAg ICAgIEluamVjdGVkU2NyaXB0QWNjZXNzLmFwcGx5U3R5bGVSdWxlVGV4dCh0aGlzLnJ1bGUuaWQs IG5ld0NvbnRlbnQsIHRoaXMucGFuZS5ub2RlLmlkLCBjYWxsYmFjayk7CiAgICAgfSwKIAotICAg IGVkaXRpbmdTZWxlY3RvckNhbmNlbGxlZDogZnVuY3Rpb24oZWxlbWVudCwgY29udGV4dCkKKyAg ICBlZGl0aW5nU2VsZWN0b3JDYW5jZWxsZWQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGVs ZW1lbnQudGV4dENvbnRlbnQgPSBjb250ZXh0OworICAgICAgICAvLyBEbyBub3RoaW5nLCB0aGlz IGlzIG92ZXJyaWRkZW4gYnkgQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uLgogICAgIH0KIH0K IAogV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLl9fcHJvdG9f XyA9IFdlYkluc3BlY3Rvci5Qcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGU7CiAKLVdlYkluc3Bl Y3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24gPSBmdW5jdGlvbigpCitXZWJJbnNwZWN0 b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uID0gZnVuY3Rpb24oZGVmYXVsdFNlbGVjdG9y VGV4dCkKIHsKLSAgICBXZWJJbnNwZWN0b3IuUHJvcGVydGllc1NlY3Rpb24uY2FsbCh0aGlzLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRvdWJsZS1DbGljayB0byBBZGQiKSwgbnVsbCk7CisgICAg V2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24uY2FsbCh0aGlzLCB7c2VsZWN0b3JU ZXh0OiBkZWZhdWx0U2VsZWN0b3JUZXh0LCBydWxlOiB7aXNWaWFJbnNwZWN0b3I6IHRydWV9fSwg IiIsIGZhbHNlLCB7fSwgZmFsc2UpOwogCi0gICAgdGhpcy5fYmxhbmsgPSB0cnVlOwotICAgIHRo aXMuX2RibGNsaWNrTGlzdGVuZXIgPSB0aGlzLl9kYmxjbGljay5iaW5kKHRoaXMpOwogICAgIHRo aXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJibGFuay1zZWN0aW9uIik7Ci0gICAgdGhpcy50aXRs ZUVsZW1lbnQuYWRkU3R5bGVDbGFzcygiYmxhbmstdGl0bGUiKTsKLSAgICB0aGlzLnRpdGxlRWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIGZ1bmN0aW9uKGUpIHsgZS5zdG9wUHJvcGFn YXRpb24oKTsgfSwgZmFsc2UpOwotICAgIHRoaXMudGl0bGVFbGVtZW50LmFkZEV2ZW50TGlzdGVu ZXIoImRibGNsaWNrIiwgdGhpcy5fZGJsY2xpY2tMaXN0ZW5lciwgZmFsc2UpOwogfQogCiBXZWJJ bnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKLSAgICBf ZGJsY2xpY2s6IGZ1bmN0aW9uKGV2ZW50KQorICAgIGV4cGFuZDogZnVuY3Rpb24oKQogICAgIHsK LSAgICAgICAgdGhpcy5zdGFydEVkaXRpbmcoKTsKLSAgICB9LAotCi0gICAgc3RhcnRFZGl0aW5n OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB2YXIgZWxlbWVudCA9IHRoaXMudGl0bGVFbGVt ZW50OwotICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmlzQmVpbmdFZGl0ZWQoZWxlbWVudCkpCi0g ICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQudGV4dENvbnRl bnQgPSB0aGlzLnBhbmUuYXBwcm9wcmlhdGVTZWxlY3RvckZvck5vZGUoKTsKLSAgICAgICAgdGhp cy50aXRsZUVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiYmxhbmstdGl0bGUiKTsKLSAgICAgICAg V2ViSW5zcGVjdG9yLnN0YXJ0RWRpdGluZyh0aGlzLnRpdGxlRWxlbWVudCwgdGhpcy5lZGl0aW5n Q29tbWl0dGVkLmJpbmQodGhpcyksIHRoaXMuZWRpdGluZ0NhbmNlbGxlZC5iaW5kKHRoaXMpLCAi Iik7Ci0gICAgICAgIHdpbmRvdy5nZXRTZWxlY3Rpb24oKS5zZXRCYXNlQW5kRXh0ZW50KGVsZW1l bnQsIDAsIGVsZW1lbnQsIDEpOworICAgICAgICAvLyBEbyBub3RoaW5nLCBibGFuayBzZWN0aW9u cyBhcmUgbm90IGV4cGFuZGFibGUuCiAgICAgfSwKIAotICAgIGVkaXRpbmdDYW5jZWxsZWQ6IGZ1 bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMudGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEb3VibGUtQ2xpY2sgdG8gQWRkIik7Ci0gICAgICAgIHRo aXMudGl0bGVFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImJsYW5rLXRpdGxlIik7Ci0gICAgfSwKLQot ICAgIGVkaXRpbmdDb21taXR0ZWQ6IGZ1bmN0aW9uKGVsZW1lbnQsIG5ld0NvbnRlbnQsIG9sZENv bnRlbnQsIGNvbnRleHQpCisgICAgZWRpdGluZ1NlbGVjdG9yQ29tbWl0dGVkOiBmdW5jdGlvbihl bGVtZW50LCBuZXdDb250ZW50LCBvbGRDb250ZW50LCBjb250ZXh0KQogICAgIHsKICAgICAgICAg dmFyIHNlbGYgPSB0aGlzOwotICAgICAgICB2YXIgY2FsbGJhY2sgPSBmdW5jdGlvbihyZXN1bHQp IHsKKyAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2socmVzdWx0KQorICAgICAgICB7CiAgICAgICAg ICAgICBpZiAoIXJlc3VsdCkgewogICAgICAgICAgICAgICAgIC8vIEludmFsaWQgU3ludGF4IGZv ciBhIFNlbGVjdG9yCi0gICAgICAgICAgICAgICAgc2VsZi5lZGl0aW5nQ2FuY2VsbGVkKCk7Cisg ICAgICAgICAgICAgICAgc2VsZi5lZGl0aW5nU2VsZWN0b3JDYW5jZWxsZWQoKTsKICAgICAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB2YXIgc3R5bGVSdWxl ID0gcmVzdWx0WzBdOworCisgICAgICAgICAgICB2YXIgcnVsZSA9IHJlc3VsdFswXTsKICAgICAg ICAgICAgIHZhciBkb2VzU2VsZWN0b3JBZmZlY3RTZWxlY3RlZE5vZGUgPSByZXN1bHRbMV07Ci0g ICAgICAgICAgICBzZWxmLm1ha2VOb3JtYWwoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRp b24ucGFyc2VSdWxlKHN0eWxlUnVsZSkpOworCisgICAgICAgICAgICB2YXIgc3R5bGVSdWxlID0g V2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24ucGFyc2VSdWxlKHJ1bGUpOworICAgICAg ICAgICAgc3R5bGVSdWxlLnJ1bGUgPSBydWxlOworCisgICAgICAgICAgICBzZWxmLm1ha2VOb3Jt YWwoc3R5bGVSdWxlKTsKIAogICAgICAgICAgICAgaWYgKCFkb2VzU2VsZWN0b3JBZmZlY3RTZWxl Y3RlZE5vZGUpIHsKICAgICAgICAgICAgICAgICBzZWxmLm5vQWZmZWN0ID0gdHJ1ZTsKQEAgLTcy MSwzMSArNzQ4LDI4IEBAIFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24u cHJvdG90eXBlID0gewogICAgICAgICAgICAgc2VsZi5zdWJ0aXRsZUVsZW1lbnQudGV4dENvbnRl bnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoInZpYSBpbnNwZWN0b3IiKTsKICAgICAgICAgICAg IHNlbGYuZXhwYW5kKCk7CiAKLSAgICAgICAgICAgIHNlbGYucGFuZS5hZGRCbGFua1NlY3Rpb24o KTsKICAgICAgICAgICAgIHNlbGYuYWRkTmV3QmxhbmtQcm9wZXJ0eSgpLnN0YXJ0RWRpdGluZygp OwotICAgICAgICB9OworICAgICAgICB9CisKICAgICAgICAgSW5qZWN0ZWRTY3JpcHRBY2Nlc3Mu YWRkU3R5bGVTZWxlY3RvcihuZXdDb250ZW50LCB0aGlzLnBhbmUubm9kZS5pZCwgY2FsbGJhY2sp OwogICAgIH0sCiAKKyAgICBlZGl0aW5nU2VsZWN0b3JDYW5jZWxsZWQ6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIHRoaXMucGFuZS5yZW1vdmVTZWN0aW9uKHRoaXMpOworICAgIH0sCisKICAg ICBtYWtlTm9ybWFsOiBmdW5jdGlvbihzdHlsZVJ1bGUpCiAgICAgewotICAgICAgICB0aGlzLnRp dGxlRWxlbWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJkYmxjbGljayIsIHRoaXMuX2RibGNsaWNr TGlzdGVuZXIsIGZhbHNlKTsKLSAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigiZGJsY2xpY2siLCB0aGlzLl9kYmxjbGlja1NlbGVjdG9yLmJpbmQodGhpcyksIGZhbHNl KTsKLSAgICAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRibGNsaWNrIiwgdGhp cy5fZGJsY2xpY2tFbXB0eVNwYWNlLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICAgICAgdGhpcy5l bGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImJsYW5rLXNlY3Rpb24iKTsKLSAgICAgICAgZGVsZXRl IHRoaXMuX2JsYW5rOwotICAgICAgICBkZWxldGUgdGhpcy5fZGJsY2xpY2s7Ci0gICAgICAgIGRl bGV0ZSB0aGlzLnN0YXJ0RWRpdGluZzsKLSAgICAgICAgZGVsZXRlIHRoaXMuZWRpdGluZ0NhbmNl bGxlZDsKLSAgICAgICAgZGVsZXRlIHRoaXMuZWRpdGluZ0NvbW1pdHRlZDsKLSAgICAgICAgZGVs ZXRlIHRoaXMuX2RibGNsaWNrTGlzdGVuZXI7Ci0gICAgICAgIGRlbGV0ZSB0aGlzLm1ha2VOb3Jt YWw7CisKICAgICAgICAgdGhpcy5zdHlsZVJ1bGUgPSBzdHlsZVJ1bGU7CiAgICAgICAgIHRoaXMu cnVsZSA9IHN0eWxlUnVsZS5ydWxlOwogICAgICAgICB0aGlzLmNvbXB1dGVkU3R5bGUgPSBmYWxz ZTsKICAgICAgICAgdGhpcy5lZGl0YWJsZSA9IHRydWU7Ci0gICAgICAgIHRoaXMuaWRlbnRpZmll ciA9IHN0eWxlUnVsZS5zZWxlY3RvclRleHQgKyAiOmluc3BlY3RvciI7Ci0gICAgICAgIC8vIGxl ZnRvdmVycyBhcmU6IHRoaXMubm9BZmZlY3QgaWYgYXBwbGljYWJsZQorICAgICAgICB0aGlzLmlk ZW50aWZpZXIgPSBzdHlsZVJ1bGUuc2VsZWN0b3JUZXh0ICsgIjp2aWEgaW5zcGVjdG9yIjsKKwor ICAgICAgICB0aGlzLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0 aW9uLnByb3RvdHlwZTsKICAgICB9CiB9CiAKQEAgLTEwMTYsNyArMTA0MCw4IEBAIFdlYkluc3Bl Y3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB2YXIg ZGlzYWJsZWQgPSAhZXZlbnQudGFyZ2V0LmNoZWNrZWQ7CiAKICAgICAgICAgdmFyIHNlbGYgPSB0 aGlzOwotICAgICAgICB2YXIgY2FsbGJhY2sgPSBmdW5jdGlvbihuZXdQYXlsb2FkKSB7CisgICAg ICAgIGZ1bmN0aW9uIGNhbGxiYWNrKG5ld1BheWxvYWQpCisgICAgICAgIHsKICAgICAgICAgICAg IGlmICghbmV3UGF5bG9hZCkKICAgICAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTEwMzEsNyAr MTA1Niw4IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBl ID0gewogICAgICAgICAgICAgICAgIHNlbGYudHJlZU91dGxpbmUuc2VjdGlvbi5wYW5lLmRpc3Bh dGNoRXZlbnRUb0xpc3RlbmVycygic3R5bGUgcHJvcGVydHkgdG9nZ2xlZCIpOwogCiAgICAgICAg ICAgICBzZWxmLnVwZGF0ZUFsbCh0cnVlKTsKLSAgICAgICAgfTsKKyAgICAgICAgfQorCiAgICAg ICAgIEluamVjdGVkU2NyaXB0QWNjZXNzLnRvZ2dsZVN0eWxlRW5hYmxlZCh0aGlzLnN0eWxlLmlk LCB0aGlzLm5hbWUsIGRpc2FibGVkLCBjYWxsYmFjayk7CiAgICAgfSwKIApAQCAtMTI1MCw3ICsx Mjc2LDggQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICBtb3ZlVG9OZXh0Q2FsbGJhY2sodGhpcy5fbmV3UHJvcGVydHksIGZh bHNlLCB0aGlzLnRyZWVPdXRsaW5lLnNlY3Rpb24sIGZhbHNlKTsKIAogICAgICAgICAvLyBUaGUg Q2FsbGJhY2sgdG8gc3RhcnQgZWRpdGluZyB0aGUgbmV4dCBwcm9wZXJ0eQotICAgICAgICBmdW5j dGlvbiBtb3ZlVG9OZXh0Q2FsbGJhY2soYWxyZWFkeU5ldywgdmFsdWVDaGFuZ2VkLCBzZWN0aW9u KSB7CisgICAgICAgIGZ1bmN0aW9uIG1vdmVUb05leHRDYWxsYmFjayhhbHJlYWR5TmV3LCB2YWx1 ZUNoYW5nZWQsIHNlY3Rpb24pCisgICAgICAgIHsKICAgICAgICAgICAgIGlmICghbW92ZURpcmVj dGlvbikKICAgICAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTEzMDMsNyArMTMzMCw4IEBAIFdl Ykluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAg ICB9CiAKICAgICAgICAgdmFyIHNlbGYgPSB0aGlzOwotICAgICAgICB2YXIgY2FsbGJhY2sgPSBm dW5jdGlvbihyZXN1bHQpIHsKKyAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2socmVzdWx0KQorICAg ICAgICB7CiAgICAgICAgICAgICBpZiAoIXJlc3VsdCkgewogICAgICAgICAgICAgICAgIC8vIFRo ZSB1c2VyIHR5cGVkIHNvbWV0aGluZywgYnV0IGl0IGRpZG4ndCBwYXJzZS4gSnVzdCBhYm9ydCBh bmQgcmVzdG9yZQogICAgICAgICAgICAgICAgIC8vIHRoZSBvcmlnaW5hbCB0aXRsZSBmb3IgdGhp cyBwcm9wZXJ0eS4gIElmIHRoaXMgd2FzIGEgbmV3IGF0dHJpYnV0ZSBhbmQKQEAgLTEzMzMsNyAr MTM2MSw4IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBl ID0gewogCiAgICAgICAgICAgICBpZiAoIXNlbGYucnVsZSkKICAgICAgICAgICAgICAgICBXZWJJ bnNwZWN0b3IucGFuZWxzLmVsZW1lbnRzLnRyZWVPdXRsaW5lLnVwZGF0ZSgpOwotICAgICAgICB9 OworICAgICAgICB9CisKICAgICAgICAgSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuYXBwbHlTdHlsZVRl eHQodGhpcy5zdHlsZS5pZCwgc3R5bGVUZXh0LnRyaW1XaGl0ZXNwYWNlKCksIHRoaXMubmFtZSwg Y2FsbGJhY2spOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzCmluZGV4IDFkNzUwNDkuLjA0N2EzNzggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcwpAQCAtMTQ1NiwxNyArMTQ1NiwxOSBAQCBXZWJJbnNwZWN0b3Iuc3RhcnRF ZGl0aW5nID0gZnVuY3Rpb24oZWxlbWVudCwgY29tbWl0dGVkQ2FsbGJhY2ssIGNhbmNlbGxlZENh bGxiYQogICAgIH0KIAogICAgIGZ1bmN0aW9uIGVkaXRpbmdDYW5jZWxsZWQoKSB7Ci0gICAgICAg IHRoaXMuaW5uZXJUZXh0ID0gb2xkVGV4dDsKKyAgICAgICAgdGhpcy50ZXh0Q29udGVudCA9IG9s ZFRleHQ7CiAKICAgICAgICAgY2xlYW5VcEFmdGVyRWRpdGluZy5jYWxsKHRoaXMpOwogCi0gICAg ICAgIGNhbmNlbGxlZENhbGxiYWNrKHRoaXMsIGNvbnRleHQpOworICAgICAgICBpZiAoY2FuY2Vs bGVkQ2FsbGJhY2spCisgICAgICAgICAgICBjYW5jZWxsZWRDYWxsYmFjayh0aGlzLCBjb250ZXh0 KTsKICAgICB9CiAKICAgICBmdW5jdGlvbiBlZGl0aW5nQ29tbWl0dGVkKCkgewogICAgICAgICBj bGVhblVwQWZ0ZXJFZGl0aW5nLmNhbGwodGhpcyk7CiAKLSAgICAgICAgY29tbWl0dGVkQ2FsbGJh Y2sodGhpcywgdGhpcy50ZXh0Q29udGVudCwgb2xkVGV4dCwgY29udGV4dCwgbW92ZURpcmVjdGlv bik7CisgICAgICAgIGlmIChjb21taXR0ZWRDYWxsYmFjaykKKyAgICAgICAgICAgIGNvbW1pdHRl ZENhbGxiYWNrKHRoaXMsIHRoaXMudGV4dENvbnRlbnQsIG9sZFRleHQsIGNvbnRleHQsIG1vdmVE aXJlY3Rpb24pOwogICAgIH0KIAogICAgIGVsZW1lbnQuaGFuZGxlS2V5RXZlbnQgPSBmdW5jdGlv bihldmVudCkgew==