50672 2010-12-08 00:18:44 -0800 Web Inspector: remove groupLevel counter from console messages 2010-12-08 03:30:45 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 50390 1 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 318686 0 yurys 2010-12-08 00:18:44 -0800 Web Inspector: remove groupLevel counter from console messages. There is no need in keeping this counter explicit as long as we have Start/EndGroup console messages. 318703 1 75881 yurys 2010-12-08 02:34:14 -0800 Created attachment 75881 Patch 318713 2 yurys 2010-12-08 03:30:45 -0800 Committed r73504: <http://trac.webkit.org/changeset/73504> 75881 2010-12-08 02:34:14 -0800 2010-12-08 03:12:44 -0800 Patch bug-50672-20101208133411.patch text/plain 28248 yurys ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzYmIxYjgzZjg1NjM1YTIwNWE5Nzc4YzM3N2M2YzZkMGQyNzBhMTI3Li5iNGIyZTUz OTIyNGU5NTI3ZDdmMDk2NDVmNTAxMWM5MmNlOTI4OGMzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTAtMTItMDggIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogcmVtb3ZlIGdyb3VwTGV2ZWwgY291bnRlciBmcm9tIGNvbnNvbGUgbWVzc2FnZXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNjcyCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvY29uc29sZS10ZXN0cy1leHBlY3RlZC50eHQ6CisKIDIwMTAtMTItMDgg IERhaSBNaWt1cnViZSAgPGRtaWt1cnViZUBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEtlbnQgVGFtdXJhLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNv bGUtdGVzdHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUtdGVz dHMtZXhwZWN0ZWQudHh0CmluZGV4IGQyZjA4N2QxNjM1ZDcxYjU3ODJjMTI4ZWMzNjQ0YmRlOGY2 ZDBhY2YuLmZhNmViZjQ4ZDVkYjYzMzY5Zjk2NWY5NGY2ZDMxOGJhMWZiNzVmZGMgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlLXRlc3RzLWV4cGVjdGVkLnR4dAorKysg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS10ZXN0cy1leHBlY3RlZC50eHQKQEAgLTIx LDI2ICsyMSwyNiBAQCBDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzA6IDEsMiwzCiBDT05TT0xFIE1F U1NBR0U6IGxpbmUgMzE6IC9yZWdleHAuKi8KIFRlc3RzIHRoYXQgY29uc29sZSBsb2dnaW5nIGR1 bXBzIHByb3BlciBtZXNzYWdlcy4KIAotY29uc29sZS10ZXN0cy5odG1sOjlsb2cgY29uc29sZS1t ZXNzYWdlIGNvbnNvbGUtanMtc291cmNlIGNvbnNvbGUtbG9nLWxldmVsCi1jb25zb2xlLXRlc3Rz Lmh0bWw6MTBkZWJ1ZyBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1qcy1zb3VyY2UgY29uc29sZS1s b2ctbGV2ZWwKLWNvbnNvbGUtdGVzdHMuaHRtbDoxMWluZm8gY29uc29sZS1tZXNzYWdlIGNvbnNv bGUtanMtc291cmNlIGNvbnNvbGUtbG9nLWxldmVsCi1jb25zb2xlLXRlc3RzLmh0bWw6MTJ3YXJu IGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWpzLXNvdXJjZSBjb25zb2xlLXdhcm5pbmctbGV2ZWwK LWNvbnNvbGUtdGVzdHMuaHRtbDoxM2Vycm9yIGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWpzLXNv dXJjZSBjb25zb2xlLWVycm9yLWxldmVsCi01Y29uc29sZS10ZXN0cy5odG1sOjE1cmVwZWF0ZWQg Y29uc29sZS1tZXNzYWdlIGNvbnNvbGUtanMtc291cmNlIGNvbnNvbGUtbG9nLWxldmVsIHJlcGVh dGVkLW1lc3NhZ2UKLWNvbnNvbGUtdGVzdHMuaHRtbDoxN2NvdW50OiAxIGNvbnNvbGUtbWVzc2Fn ZSBjb25zb2xlLWpzLXNvdXJjZSBjb25zb2xlLWxvZy1sZXZlbAotY29uc29sZS10ZXN0cy5odG1s OjE3Y291bnQ6IDIgY29uc29sZS1tZXNzYWdlIGNvbnNvbGUtanMtc291cmNlIGNvbnNvbGUtbG9n LWxldmVsCi1jb25zb2xlLXRlc3RzLmh0bWw6MThncm91cCBjb25zb2xlLW1lc3NhZ2UgY29uc29s ZS1qcy1zb3VyY2UgY29uc29sZS1sb2ctbGV2ZWwgY29uc29sZS1ncm91cC10aXRsZQotIGNvbnNv bGUtbWVzc2FnZSBjb25zb2xlLWpzLXNvdXJjZSBjb25zb2xlLWxvZy1sZXZlbAotY29uc29sZS10 ZXN0cy5odG1sOjIwMSAyIDMgY29uc29sZS1tZXNzYWdlIGNvbnNvbGUtanMtc291cmNlIGNvbnNv bGUtbG9nLWxldmVsCi1jb25zb2xlLXRlc3RzLmh0bWw6MjFncm91cENvbGxhcHNlZCBjb25zb2xl LW1lc3NhZ2UgY29uc29sZS1qcy1zb3VyY2UgY29uc29sZS1sb2ctbGV2ZWwgY29uc29sZS1ncm91 cC10aXRsZQotY29uc29sZS10ZXN0cy5odG1sOjIyT2JqZWN0IGNvbnNvbGUtbWVzc2FnZSBjb25z b2xlLWpzLXNvdXJjZSBjb25zb2xlLWxvZy1sZXZlbAotY29uc29sZS10ZXN0cy5odG1sOjIzNDIg Y29uc29sZS1tZXNzYWdlIGNvbnNvbGUtanMtc291cmNlIGNvbnNvbGUtbG9nLWxldmVsCi1jb25z b2xlLXRlc3RzLmh0bWw6MjR0cnVlIGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWpzLXNvdXJjZSBj b25zb2xlLWxvZy1sZXZlbAotY29uc29sZS10ZXN0cy5odG1sOjI1bnVsbCBjb25zb2xlLW1lc3Nh Z2UgY29uc29sZS1qcy1zb3VyY2UgY29uc29sZS1sb2ctbGV2ZWwKLWNvbnNvbGUtdGVzdHMuaHRt bDoyNnVuZGVmaW5lZCBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1qcy1zb3VyY2UgY29uc29sZS1s b2ctbGV2ZWwKLWNvbnNvbGUtdGVzdHMuaHRtbDoyN0RvY3VtZW50IGNvbnNvbGUtbWVzc2FnZSBj b25zb2xlLWpzLXNvdXJjZSBjb25zb2xlLWxvZy1sZXZlbAotY29uc29sZS10ZXN0cy5odG1sOjI4 ZnVuY3Rpb24gKCkgeyB9IGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWpzLXNvdXJjZSBjb25zb2xl LWxvZy1sZXZlbAotY29uc29sZS10ZXN0cy5odG1sOjI5ZnVuY3Rpb24gZigpIHsgfSBjb25zb2xl LW1lc3NhZ2UgY29uc29sZS1qcy1zb3VyY2UgY29uc29sZS1sb2ctbGV2ZWwKLWNvbnNvbGUtdGVz dHMuaHRtbDozMFsxLCAyLCAzXSBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1qcy1zb3VyY2UgY29u c29sZS1sb2ctbGV2ZWwKLWNvbnNvbGUtdGVzdHMuaHRtbDozMS9yZWdleHAuKi8gY29uc29sZS1t ZXNzYWdlIGNvbnNvbGUtanMtc291cmNlIGNvbnNvbGUtbG9nLWxldmVsCitjb25zb2xlLXRlc3Rz Lmh0bWw6OWxvZyBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1sb2ctbGV2ZWwKK2NvbnNvbGUtdGVz dHMuaHRtbDoxMGRlYnVnIGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWxvZy1sZXZlbAorY29uc29s ZS10ZXN0cy5odG1sOjExaW5mbyBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1sb2ctbGV2ZWwKK2Nv bnNvbGUtdGVzdHMuaHRtbDoxMndhcm4gY29uc29sZS1tZXNzYWdlIGNvbnNvbGUtd2FybmluZy1s ZXZlbAorY29uc29sZS10ZXN0cy5odG1sOjEzZXJyb3IgY29uc29sZS1tZXNzYWdlIGNvbnNvbGUt ZXJyb3ItbGV2ZWwKKzVjb25zb2xlLXRlc3RzLmh0bWw6MTVyZXBlYXRlZCBjb25zb2xlLW1lc3Nh Z2UgY29uc29sZS1sb2ctbGV2ZWwgcmVwZWF0ZWQtbWVzc2FnZQorY29uc29sZS10ZXN0cy5odG1s OjE3Y291bnQ6IDEgY29uc29sZS1tZXNzYWdlIGNvbnNvbGUtbG9nLWxldmVsCitjb25zb2xlLXRl c3RzLmh0bWw6MTdjb3VudDogMiBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1sb2ctbGV2ZWwKK2Nv bnNvbGUtdGVzdHMuaHRtbDoxOGdyb3VwIGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWxvZy1sZXZl bCBjb25zb2xlLWdyb3VwLXRpdGxlCisgY29uc29sZS1tZXNzYWdlIGNvbnNvbGUtbG9nLWxldmVs Citjb25zb2xlLXRlc3RzLmh0bWw6MjAxIDIgMyBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1sb2ct bGV2ZWwKK2NvbnNvbGUtdGVzdHMuaHRtbDoyMWdyb3VwQ29sbGFwc2VkIGNvbnNvbGUtbWVzc2Fn ZSBjb25zb2xlLWxvZy1sZXZlbCBjb25zb2xlLWdyb3VwLXRpdGxlCitjb25zb2xlLXRlc3RzLmh0 bWw6MjJPYmplY3QgY29uc29sZS1tZXNzYWdlIGNvbnNvbGUtbG9nLWxldmVsCitjb25zb2xlLXRl c3RzLmh0bWw6MjM0MiBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1sb2ctbGV2ZWwKK2NvbnNvbGUt dGVzdHMuaHRtbDoyNHRydWUgY29uc29sZS1tZXNzYWdlIGNvbnNvbGUtbG9nLWxldmVsCitjb25z b2xlLXRlc3RzLmh0bWw6MjVudWxsIGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWxvZy1sZXZlbAor Y29uc29sZS10ZXN0cy5odG1sOjI2dW5kZWZpbmVkIGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWxv Zy1sZXZlbAorY29uc29sZS10ZXN0cy5odG1sOjI3RG9jdW1lbnQgY29uc29sZS1tZXNzYWdlIGNv bnNvbGUtbG9nLWxldmVsCitjb25zb2xlLXRlc3RzLmh0bWw6MjhmdW5jdGlvbiAoKSB7IH0gY29u c29sZS1tZXNzYWdlIGNvbnNvbGUtbG9nLWxldmVsCitjb25zb2xlLXRlc3RzLmh0bWw6MjlmdW5j dGlvbiBmKCkgeyB9IGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWxvZy1sZXZlbAorY29uc29sZS10 ZXN0cy5odG1sOjMwWzEsIDIsIDNdIGNvbnNvbGUtbWVzc2FnZSBjb25zb2xlLWxvZy1sZXZlbAor Y29uc29sZS10ZXN0cy5odG1sOjMxL3JlZ2V4cC4qLyBjb25zb2xlLW1lc3NhZ2UgY29uc29sZS1s b2ctbGV2ZWwKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCA4Y2VjOWFhZWUyMWUxN2ZkOWI3NzgxMjU5MmMzMWU3ODEyN2ZhMzc0Li5kZTdh ODYzZmZiZjI3MTY4ZDJjMmFhMTQ3NTk0YjYyZTRiYTdmMzVjIDEwMDY0NAotLS0gYS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDEw LTEyLTA4ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJl bW92ZSBncm91cExldmVsIGNvdW50ZXIgZnJvbSBjb25zb2xlIG1lc3NhZ2VzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDY3MgorCisgICAgICAgICog aW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGVN ZXNzYWdlOjpDb25zb2xlTWVzc2FnZSk6CisgICAgICAgIChXZWJDb3JlOjpDb25zb2xlTWVzc2Fn ZTo6YWRkVG9Gcm9udGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpDb25zb2xlTWVzc2FnZTo6aXNF cXVhbCk6CisgICAgICAgICogaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmg6CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yQ29udHJvbGxlcjo6SW5zcGVjdG9yQ29udHJvbGxlcik6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JDb250cm9sbGVyOjphZGRNZXNzYWdlVG9Db25zb2xlKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmNsZWFyQ29uc29sZU1lc3NhZ2VzKToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnN0YXJ0R3JvdXApOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZW5kR3JvdXApOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9Db25zb2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5jcmVh dGVGaWx0ZXJFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLmZpbHRlcik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLmFmdGVyU2hvdyk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLmFkZE1lc3NhZ2UpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS51cGRhdGVNZXNzYWdlUmVw ZWF0Q291bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5j bGVhck1lc3NhZ2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY3JlYXRlVGV4dE1lc3NhZ2UpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS50b01lc3NhZ2VF bGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUu X2FkZE1lc3NhZ2VIZWFkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl LnByb3RvdHlwZS5fdXBkYXRlUmVwZWF0Q291bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNv bnNvbGVNZXNzYWdlLnByb3RvdHlwZS50b1N0cmluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UucHJvdG90eXBlLmlzRXF1YWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNvbnNvbGVHcm91cCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuX2NoZWNrV2Fybmlu Zyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX2FkZE1lc3NhZ2VUb1NvdXJj ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuYWRkQ29uc29sZU1lc3NhZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LmxvZy5sb2dNZXNzYWdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5sb2cpOgorCiAyMDEwLTEy LTA4ICBZdXRhIEtpdGFtdXJhICA8eXV0YWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJvbGxpbmcgb3V0IHI3MzQ5Mi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L0NvbnNvbGVNZXNzYWdlLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNw cAppbmRleCBmMTUzNGRmMDgxMWY5MjFkNzAzNTVmYjYyMTAwODMxZGFkMzgxNTc3Li41ODEyYWE0 NmRhMzI3MDJmYzYyY2M5NjAzYjU4MGUyNWRiOTRmMmEzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9Db25zb2xlTWVzc2FnZS5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29s ZU1lc3NhZ2UuY3BwCkBAIC00MywyNiArNDMsMjQgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci1Db25zb2xlTWVzc2FnZTo6Q29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZSBzLCBNZXNzYWdl VHlwZSB0LCBNZXNzYWdlTGV2ZWwgbCwgY29uc3QgU3RyaW5nJiBtLCB1bnNpZ25lZCBsaSwgY29u c3QgU3RyaW5nJiB1LCB1bnNpZ25lZCBnKQorQ29uc29sZU1lc3NhZ2U6OkNvbnNvbGVNZXNzYWdl KE1lc3NhZ2VTb3VyY2UgcywgTWVzc2FnZVR5cGUgdCwgTWVzc2FnZUxldmVsIGwsIGNvbnN0IFN0 cmluZyYgbSwgdW5zaWduZWQgbGksIGNvbnN0IFN0cmluZyYgdSkKICAgICA6IG1fc291cmNlKHMp CiAgICAgLCBtX3R5cGUodCkKICAgICAsIG1fbGV2ZWwobCkKICAgICAsIG1fbWVzc2FnZShtKQog ICAgICwgbV9saW5lKGxpKQogICAgICwgbV91cmwodSkKLSAgICAsIG1fZ3JvdXBMZXZlbChnKQog ICAgICwgbV9yZXBlYXRDb3VudCgxKQogewogfQogCi1Db25zb2xlTWVzc2FnZTo6Q29uc29sZU1l c3NhZ2UoTWVzc2FnZVNvdXJjZSBzLCBNZXNzYWdlVHlwZSB0LCBNZXNzYWdlTGV2ZWwgbCwgY29u c3QgU3RyaW5nJiBtLCBQYXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4gYXJndW1lbnRzLCBQYXNz UmVmUHRyPFNjcmlwdENhbGxTdGFjaz4gY2FsbFN0YWNrLCB1bnNpZ25lZCBnKQorQ29uc29sZU1l c3NhZ2U6OkNvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2UgcywgTWVzc2FnZVR5cGUgdCwgTWVz c2FnZUxldmVsIGwsIGNvbnN0IFN0cmluZyYgbSwgUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+ IGFyZ3VtZW50cywgUGFzc1JlZlB0cjxTY3JpcHRDYWxsU3RhY2s+IGNhbGxTdGFjaykKICAgICA6 IG1fc291cmNlKHMpCiAgICAgLCBtX3R5cGUodCkKICAgICAsIG1fbGV2ZWwobCkKICAgICAsIG1f bWVzc2FnZShtKQogICAgICwgbV9hcmd1bWVudHMoYXJndW1lbnRzKQogICAgICwgbV9jYWxsU3Rh Y2soY2FsbFN0YWNrKQotICAgICwgbV9ncm91cExldmVsKGcpCiAgICAgLCBtX3JlcGVhdENvdW50 KDEpCiB7CiAgICAgY29uc3QgU2NyaXB0Q2FsbEZyYW1lJiBsYXN0Q2FsbGVyID0gbV9jYWxsU3Rh Y2stPmF0KDApOwpAQCAtODMsNyArODEsNiBAQCB2b2lkIENvbnNvbGVNZXNzYWdlOjphZGRUb0Zy b250ZW5kKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgSW5qZWN0ZWRTY3JpcHRIbwogICAg IGpzb25PYmotPnNldE51bWJlcigibGV2ZWwiLCBzdGF0aWNfY2FzdDxpbnQ+KG1fbGV2ZWwpKTsK ICAgICBqc29uT2JqLT5zZXROdW1iZXIoImxpbmUiLCBzdGF0aWNfY2FzdDxpbnQ+KG1fbGluZSkp OwogICAgIGpzb25PYmotPnNldFN0cmluZygidXJsIiwgbV91cmwpOwotICAgIGpzb25PYmotPnNl dE51bWJlcigiZ3JvdXBMZXZlbCIsIHN0YXRpY19jYXN0PGludD4obV9ncm91cExldmVsKSk7CiAg ICAganNvbk9iai0+c2V0TnVtYmVyKCJyZXBlYXRDb3VudCIsIHN0YXRpY19jYXN0PGludD4obV9y ZXBlYXRDb3VudCkpOwogICAgIGpzb25PYmotPnNldFN0cmluZygibWVzc2FnZSIsIG1fbWVzc2Fn ZSk7CiAgICAgaWYgKG1fYXJndW1lbnRzICYmIG1fYXJndW1lbnRzLT5hcmd1bWVudENvdW50KCkp IHsKQEAgLTEzMCw4ICsxMjcsNyBAQCBib29sIENvbnNvbGVNZXNzYWdlOjppc0VxdWFsKENvbnNv bGVNZXNzYWdlKiBtc2cpIGNvbnN0CiAgICAgICAgICYmIG1zZy0+bV9sZXZlbCA9PSBtX2xldmVs CiAgICAgICAgICYmIG1zZy0+bV9tZXNzYWdlID09IG1fbWVzc2FnZQogICAgICAgICAmJiBtc2ct Pm1fbGluZSA9PSBtX2xpbmUKLSAgICAgICAgJiYgbXNnLT5tX3VybCA9PSBtX3VybAotICAgICAg ICAmJiBtc2ctPm1fZ3JvdXBMZXZlbCA9PSBtX2dyb3VwTGV2ZWw7CisgICAgICAgICYmIG1zZy0+ bV91cmwgPT0gbV91cmw7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmggYi9XZWJDb3JlL2luc3BlY3Rvci9D b25zb2xlTWVzc2FnZS5oCmluZGV4IDM1MWM1ODRkNGQxZDg5OTUzNzY1NGZmMDRlMGM3Y2ExMjI1 YTg2NGUuLmE2ZDlhMTg2MGY3MmUxNWYzMGY1Y2U4OWRmMzViYzU0YzUxYmMyMjUgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmgKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvQ29uc29sZU1lc3NhZ2UuaApAQCAtNDgsOCArNDgsOCBAQCBjbGFzcyBTY3JpcHRWYWx1 ZTsKIAogY2xhc3MgQ29uc29sZU1lc3NhZ2UgOiBwdWJsaWMgTm9uY29weWFibGUgewogcHVibGlj OgotICAgIENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2UsIE1lc3NhZ2VUeXBlLCBNZXNzYWdl TGV2ZWwsIGNvbnN0IFN0cmluZyYgbSwgdW5zaWduZWQgbGksIGNvbnN0IFN0cmluZyYgdSwgdW5z aWduZWQgZyk7Ci0gICAgQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZSwgTWVzc2FnZVR5cGUs IE1lc3NhZ2VMZXZlbCwgY29uc3QgU3RyaW5nJiBtLCBQYXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50 cz4sIFBhc3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiwgdW5zaWduZWQgZyk7CisgICAgQ29uc29s ZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZSwgTWVzc2FnZVR5cGUsIE1lc3NhZ2VMZXZlbCwgY29uc3Qg U3RyaW5nJiBtLCB1bnNpZ25lZCBsaSwgY29uc3QgU3RyaW5nJiB1KTsKKyAgICBDb25zb2xlTWVz c2FnZShNZXNzYWdlU291cmNlLCBNZXNzYWdlVHlwZSwgTWVzc2FnZUxldmVsLCBjb25zdCBTdHJp bmcmIG0sIFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiwgUGFzc1JlZlB0cjxTY3JpcHRDYWxs U3RhY2s+KTsKIAogICAgIHZvaWQgYWRkVG9Gcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCosIElu amVjdGVkU2NyaXB0SG9zdCopOwogICAgIHZvaWQgdXBkYXRlUmVwZWF0Q291bnRJbkNvbnNvbGUo SW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKTsKQEAgLTY4LDcgKzY4LDYgQEAgcHJpdmF0ZToK ICAgICBSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPiBtX2NhbGxTdGFjazsKICAgICB1bnNpZ25lZCBt X2xpbmU7CiAgICAgU3RyaW5nIG1fdXJsOwotICAgIHVuc2lnbmVkIG1fZ3JvdXBMZXZlbDsKICAg ICB1bnNpZ25lZCBtX3JlcGVhdENvdW50OwogfTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDb250cm9sbGVyLmNwcAppbmRleCA3ZWY0NzI1ZTcyNjk3YzUxNjdkZjczZGEyZDc4MDM2Mjc1 OWE1OTcxLi42ZWFmODllYjk2OTMzYmJmNWZjYWJmNjA0Njg3ODQyYjkzOWM1YzE2IDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtMTQ1LDcgKzE0NSw2IEBA IEluc3BlY3RvckNvbnRyb2xsZXI6Okluc3BlY3RvckNvbnRyb2xsZXIoUGFnZSogcGFnZSwgSW5z cGVjdG9yQ2xpZW50KiBjbGllbnQpCiAgICAgLCBtX2Nzc0FnZW50KG5ldyBJbnNwZWN0b3JDU1NB Z2VudCgpKQogICAgICwgbV9tYWluUmVzb3VyY2VJZGVudGlmaWVyKDApCiAgICAgLCBtX2V4cGly ZWRDb25zb2xlTWVzc2FnZUNvdW50KDApCi0gICAgLCBtX2dyb3VwTGV2ZWwoMCkKICAgICAsIG1f cHJldmlvdXNNZXNzYWdlKDApCiAgICAgLCBtX3NldHRpbmdzTG9hZGVkKGZhbHNlKQogICAgICwg bV9pbnNwZWN0b3JCYWNrZW5kKEluc3BlY3RvckJhY2tlbmQ6OmNyZWF0ZSh0aGlzKSkKQEAgLTMz Myw3ICszMzIsNyBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmFkZE1lc3NhZ2VUb0NvbnNv bGUoTWVzc2FnZVNvdXJjZSBzb3VyY2UsIE1lc3NhZ2VUeXBlCiAgICAgaWYgKCFlbmFibGVkKCkp CiAgICAgICAgIHJldHVybjsKIAotICAgIGFkZENvbnNvbGVNZXNzYWdlKG5ldyBDb25zb2xlTWVz c2FnZShzb3VyY2UsIHR5cGUsIGxldmVsLCBtZXNzYWdlLCBhcmd1bWVudHMsIGNhbGxTdGFjaywg bV9ncm91cExldmVsKSk7CisgICAgYWRkQ29uc29sZU1lc3NhZ2UobmV3IENvbnNvbGVNZXNzYWdl KHNvdXJjZSwgdHlwZSwgbGV2ZWwsIG1lc3NhZ2UsIGFyZ3VtZW50cywgY2FsbFN0YWNrKSk7CiB9 CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6YWRkTWVzc2FnZVRvQ29uc29sZShNZXNzYWdl U291cmNlIHNvdXJjZSwgTWVzc2FnZVR5cGUgdHlwZSwgTWVzc2FnZUxldmVsIGxldmVsLCBjb25z dCBTdHJpbmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291 cmNlSUQpCkBAIC0zNDEsNyArMzQwLDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjphZGRN ZXNzYWdlVG9Db25zb2xlKE1lc3NhZ2VTb3VyY2Ugc291cmNlLCBNZXNzYWdlVHlwZQogICAgIGlm ICghZW5hYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBhZGRDb25zb2xlTWVzc2FnZShu ZXcgQ29uc29sZU1lc3NhZ2Uoc291cmNlLCB0eXBlLCBsZXZlbCwgbWVzc2FnZSwgbGluZU51bWJl ciwgc291cmNlSUQsIG1fZ3JvdXBMZXZlbCkpOworICAgIGFkZENvbnNvbGVNZXNzYWdlKG5ldyBD b25zb2xlTWVzc2FnZShzb3VyY2UsIHR5cGUsIGxldmVsLCBtZXNzYWdlLCBsaW5lTnVtYmVyLCBz b3VyY2VJRCkpOwogfQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmFkZENvbnNvbGVNZXNz YWdlKFBhc3NPd25QdHI8Q29uc29sZU1lc3NhZ2U+IGNvbnNvbGVNZXNzYWdlKQpAQCAtMzcxLDcg KzM3MCw2IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y2xlYXJDb25zb2xlTWVzc2FnZXMo KQogICAgIG1fY29uc29sZU1lc3NhZ2VzLmNsZWFyKCk7CiAgICAgbV9leHBpcmVkQ29uc29sZU1l c3NhZ2VDb3VudCA9IDA7CiAgICAgbV9wcmV2aW91c01lc3NhZ2UgPSAwOwotICAgIG1fZ3JvdXBM ZXZlbCA9IDA7CiAgICAgbV9pbmplY3RlZFNjcmlwdEhvc3QtPnJlbGVhc2VXcmFwcGVyT2JqZWN0 R3JvdXAoMCAvKiByZWxlYXNlIHRoZSBncm91cCBpbiBhbGwgc2NyaXB0cyAqLywgImNvbnNvbGUi KTsKICAgICBpZiAobV9kb21BZ2VudCkKICAgICAgICAgbV9kb21BZ2VudC0+cmVsZWFzZURhbmds aW5nTm9kZXMoKTsKQEAgLTM4MSwxOSArMzc5LDEyIEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxl cjo6Y2xlYXJDb25zb2xlTWVzc2FnZXMoKQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnN0 YXJ0R3JvdXAoUGFzc1JlZlB0cjxTY3JpcHRBcmd1bWVudHM+IGFyZ3VtZW50cywgUGFzc1JlZlB0 cjxTY3JpcHRDYWxsU3RhY2s+IGNhbGxTdGFjaywgYm9vbCBjb2xsYXBzZWQpCiB7Ci0gICAgKytt X2dyb3VwTGV2ZWw7Ci0KLSAgICBhZGRDb25zb2xlTWVzc2FnZShuZXcgQ29uc29sZU1lc3NhZ2Uo SlNNZXNzYWdlU291cmNlLCBjb2xsYXBzZWQgPyBTdGFydEdyb3VwQ29sbGFwc2VkTWVzc2FnZVR5 cGUgOiBTdGFydEdyb3VwTWVzc2FnZVR5cGUsIExvZ01lc3NhZ2VMZXZlbCwgIiIsIGFyZ3VtZW50 cywgY2FsbFN0YWNrLCBtX2dyb3VwTGV2ZWwpKTsKKyAgICBhZGRDb25zb2xlTWVzc2FnZShuZXcg Q29uc29sZU1lc3NhZ2UoSlNNZXNzYWdlU291cmNlLCBjb2xsYXBzZWQgPyBTdGFydEdyb3VwQ29s bGFwc2VkTWVzc2FnZVR5cGUgOiBTdGFydEdyb3VwTWVzc2FnZVR5cGUsIExvZ01lc3NhZ2VMZXZl bCwgIiIsIGFyZ3VtZW50cywgY2FsbFN0YWNrKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJv bGxlcjo6ZW5kR3JvdXAoTWVzc2FnZVNvdXJjZSBzb3VyY2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIs IGNvbnN0IFN0cmluZyYgc291cmNlVVJMKQogewotICAgIGlmICghbV9ncm91cExldmVsKQotICAg ICAgICByZXR1cm47Ci0KLSAgICAtLW1fZ3JvdXBMZXZlbDsKLQotICAgIGFkZENvbnNvbGVNZXNz YWdlKG5ldyBDb25zb2xlTWVzc2FnZShzb3VyY2UsIEVuZEdyb3VwTWVzc2FnZVR5cGUsIExvZ01l c3NhZ2VMZXZlbCwgU3RyaW5nKCksIGxpbmVOdW1iZXIsIHNvdXJjZVVSTCwgbV9ncm91cExldmVs KSk7CisgICAgYWRkQ29uc29sZU1lc3NhZ2UobmV3IENvbnNvbGVNZXNzYWdlKHNvdXJjZSwgRW5k R3JvdXBNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBTdHJpbmcoKSwgbGluZU51bWJlciwg c291cmNlVVJMKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6bWFya1RpbWVsaW5l KGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNvbnRyb2xsZXIuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xs ZXIuaAppbmRleCBlNTdjMDg5MmEwODY0Y2U0M2ZjNzBhMDY2OWYzZmUzMGVhYTAzMTM2Li4wODY1 YTNhMDE2ZWVmYzU3MzBiNWJkNjY2MGIzMTM5MGY2MDY5YzVhIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0zNzAsNyArMzcwLDYgQEAgcHJpdmF0ZToKICNlbmRp ZgogICAgIFN0cmluZyBtX3Nob3dBZnRlclZpc2libGU7CiAgICAgUmVmUHRyPE5vZGU+IG1faGln aGxpZ2h0ZWROb2RlOwotICAgIHVuc2lnbmVkIG1fZ3JvdXBMZXZlbDsKICAgICBDb25zb2xlTWVz c2FnZSogbV9wcmV2aW91c01lc3NhZ2U7CiAgICAgYm9vbCBtX3NldHRpbmdzTG9hZGVkOwogICAg IFJlZlB0cjxJbnNwZWN0b3JCYWNrZW5kPiBtX2luc3BlY3RvckJhY2tlbmQ7CmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKaW5kZXggNmNmM2FlY2FkYjRkNzAzOTNl NjVhMGMxZjM2ODBhY2M1NGUzMGRhOS4uNTk4Y2IxZTUwNDJhZDgwZTRlZGExZjAwNGFkOTg5ZGRj ZjQ2N2I4MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVW aWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwpA QCAtNywxMyArNywxMyBAQAogICogYXJlIG1ldDoKICAqCiAgKiAxLiAgUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIuIAorICogICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lci4KICAqIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAogICogICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAq ICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0 aGUgZGlzdHJpYnV0aW9uLiAKKyAqICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRl cmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgogICogMy4gIE5laXRoZXIgdGhl IG5hbWUgb2YgQXBwbGUgQ29tcHV0ZXIsIEluYy4gKCJBcHBsZSIpIG5vciB0aGUgbmFtZXMgb2YK ICAqICAgICBpdHMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90 ZSBwcm9kdWN0cyBkZXJpdmVkCi0gKiAgICAgZnJvbSB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3Bl Y2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLiAKKyAqICAgICBmcm9tIHRoaXMgc29mdHdh cmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCiAgKgogICogVEhJ UyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMg SVMiIEFORCBBTlkKICAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQKQEAgLTUwLDkgKzUwLDggQEAgV2ViSW5z cGVjdG9yLkNvbnNvbGVWaWV3ID0gZnVuY3Rpb24oZHJhd2VyKQogICAgIHRoaXMucHJvbXB0ID0g bmV3IFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0KHRoaXMucHJvbXB0RWxlbWVudCwgdGhpcy5jb21w bGV0aW9ucy5iaW5kKHRoaXMpLCBFeHByZXNzaW9uU3RvcENoYXJhY3RlcnMgKyAiLiIpOwogICAg IHRoaXMucHJvbXB0Lmhpc3RvcnkgPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuY29uc29sZUhpc3Rv cnk7CiAKLSAgICB0aGlzLnRvcEdyb3VwID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlR3JvdXAo bnVsbCwgMCk7CisgICAgdGhpcy50b3BHcm91cCA9IG5ldyBXZWJJbnNwZWN0b3IuQ29uc29sZUdy b3VwKG51bGwpOwogICAgIHRoaXMubWVzc2FnZXNFbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLnRv cEdyb3VwLmVsZW1lbnQsIHRoaXMucHJvbXB0RWxlbWVudCk7Ci0gICAgdGhpcy5ncm91cExldmVs ID0gMDsKICAgICB0aGlzLmN1cnJlbnRHcm91cCA9IHRoaXMudG9wR3JvdXA7CiAKICAgICB0aGlz LnRvZ2dsZUNvbnNvbGVCdXR0b24gPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29sZS1z dGF0dXMtYmFyLWl0ZW0iKTsKQEAgLTcyLDcgKzcxLDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVW aWV3ID0gZnVuY3Rpb24oZHJhd2VyKQogICAgIGZ1bmN0aW9uIGNyZWF0ZUZpbHRlckVsZW1lbnQo Y2F0ZWdvcnkpIHsKICAgICAgICAgdmFyIGNhdGVnb3J5RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImxpIik7CiAgICAgICAgIGNhdGVnb3J5RWxlbWVudC5jYXRlZ29yeSA9IGNhdGVn b3J5OwotICAgICAgICBjYXRlZ29yeUVsZW1lbnQuYWRkU3R5bGVDbGFzcyhjYXRlZ29yeUVsZW1l bnQuY2F0ZWdvcnkpOyAgICAgICAgICAgIAorICAgICAgICBjYXRlZ29yeUVsZW1lbnQuYWRkU3R5 bGVDbGFzcyhjYXRlZ29yeUVsZW1lbnQuY2F0ZWdvcnkpOwogICAgICAgICBjYXRlZ29yeUVsZW1l bnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB1cGRhdGVGaWx0ZXJIYW5kbGVyLCBmYWxzZSk7 CiAKICAgICAgICAgdmFyIGxhYmVsID0gY2F0ZWdvcnkudG9TdHJpbmcoKTsKQEAgLTgxLDcgKzgw LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3ID0gZnVuY3Rpb24oZHJhd2VyKQogICAgICAg ICB0aGlzLmZpbHRlckJhckVsZW1lbnQuYXBwZW5kQ2hpbGQoY2F0ZWdvcnlFbGVtZW50KTsKICAg ICAgICAgcmV0dXJuIGNhdGVnb3J5RWxlbWVudDsKICAgICB9Ci0gICAgCisKICAgICB0aGlzLmFs bEVsZW1lbnQgPSBjcmVhdGVGaWx0ZXJFbGVtZW50LmNhbGwodGhpcywgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJBbGwiKSk7CiAgICAgY3JlYXRlRGl2aWRlckVsZW1lbnQuY2FsbCh0aGlzKTsKICAg ICB0aGlzLmVycm9yRWxlbWVudCA9IGNyZWF0ZUZpbHRlckVsZW1lbnQuY2FsbCh0aGlzLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkVycm9ycyIpKTsKQEAgLTkyLDcgKzkxLDcgQEAgV2ViSW5zcGVj dG9yLkNvbnNvbGVWaWV3ID0gZnVuY3Rpb24oZHJhd2VyKQogICAgIHRoaXMuX3JlZ2lzdGVyU2hv cnRjdXRzKCk7CiAKICAgICB0aGlzLm1lc3NhZ2VzRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJj b250ZXh0bWVudSIsIHRoaXMuX2hhbmRsZUNvbnRleHRNZW51RXZlbnQuYmluZCh0aGlzKSwgdHJ1 ZSk7Ci0gICAgCisKICAgICB0aGlzLl9jdXN0b21Gb3JtYXR0ZXJzID0gewogICAgICAgICAib2Jq ZWN0IjogdGhpcy5fZm9ybWF0b2JqZWN0LAogICAgICAgICAiYXJyYXkiOiAgdGhpcy5fZm9ybWF0 YXJyYXksCkBAIC0xMTMsNyArMTEyLDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3Rv dHlwZSA9IHsKIAogICAgICAgICB0aGlzLmZpbHRlcihlLnRhcmdldCwgc2VsZWN0TXVsdGlwbGUp OwogICAgIH0sCi0gICAgCisKICAgICBmaWx0ZXI6IGZ1bmN0aW9uKHRhcmdldCwgc2VsZWN0TXVs dGlwbGUpCiAgICAgewogICAgICAgICBmdW5jdGlvbiB1bnNlbGVjdEFsbCgpCkBAIC0xMjIsMTMg KzEyMSwxMyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAg ICAgICAgdGhpcy5lcnJvckVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic2VsZWN0ZWQiKTsKICAg ICAgICAgICAgIHRoaXMud2FybmluZ0VsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic2VsZWN0ZWQi KTsKICAgICAgICAgICAgIHRoaXMubG9nRWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJzZWxlY3Rl ZCIpOwotICAgICAgICAgICAgCisKICAgICAgICAgICAgIHRoaXMubWVzc2FnZXNFbGVtZW50LnJl bW92ZVN0eWxlQ2xhc3MoImZpbHRlci1hbGwiKTsKICAgICAgICAgICAgIHRoaXMubWVzc2FnZXNF bGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImZpbHRlci1lcnJvcnMiKTsKICAgICAgICAgICAgIHRo aXMubWVzc2FnZXNFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImZpbHRlci13YXJuaW5ncyIpOwog ICAgICAgICAgICAgdGhpcy5tZXNzYWdlc0VsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiZmlsdGVy LWxvZ3MiKTsKICAgICAgICAgfQotICAgICAgICAKKwogICAgICAgICB2YXIgdGFyZ2V0RmlsdGVy Q2xhc3MgPSAiZmlsdGVyLSIgKyB0YXJnZXQuY2F0ZWdvcnkudG9Mb3dlckNhc2UoKTsKIAogICAg ICAgICBpZiAodGFyZ2V0LmNhdGVnb3J5ID09ICJBbGwiKSB7CkBAIC0xNDUsMTggKzE0NCwxOCBA QCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAg IHRoaXMubWVzc2FnZXNFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImZpbHRlci1hbGwiKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICAKKwogICAgICAgICBpZiAoIXNlbGVjdE11 bHRpcGxlKSB7CiAgICAgICAgICAgICAvLyBJZiBtdWx0aXBsZSBzZWxlY3Rpb24gaXMgb2ZmLCB3 ZSB3YW50IHRvIHVuc2VsZWN0IGV2ZXJ5dGhpbmcgZWxzZQogICAgICAgICAgICAgLy8gYW5kIGp1 c3Qgc2VsZWN0IG91cnNlbHZlcy4KICAgICAgICAgICAgIHVuc2VsZWN0QWxsLmNhbGwodGhpcyk7 Ci0gICAgICAgICAgICAKKwogICAgICAgICAgICAgdGFyZ2V0LmFkZFN0eWxlQ2xhc3MoInNlbGVj dGVkIik7CiAgICAgICAgICAgICB0aGlzLm1lc3NhZ2VzRWxlbWVudC5hZGRTdHlsZUNsYXNzKHRh cmdldEZpbHRlckNsYXNzKTsKLSAgICAgICAgICAgIAorCiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIH0KLSAgICAgICAgCisKICAgICAgICAgaWYgKHRhcmdldC5oYXNTdHlsZUNsYXNzKCJz ZWxlY3RlZCIpKSB7CiAgICAgICAgICAgICAvLyBJZiBzZWxlY3RNdWx0aXBsZSBpcyB0dXJuZWQg b24sIGFuZCB3ZSB3ZXJlIHNlbGVjdGVkLCB3ZSBqdXN0CiAgICAgICAgICAgICAvLyB3YW50IHRv IHVuc2VsZWN0IG91cnNlbHZlcy4KQEAgLTE2OSw3ICsxNjgsNyBAQCBXZWJJbnNwZWN0b3IuQ29u c29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5tZXNzYWdlc0VsZW1lbnQu YWRkU3R5bGVDbGFzcyh0YXJnZXRGaWx0ZXJDbGFzcyk7CiAgICAgICAgIH0KICAgICB9LAotICAg IAorCiAgICAgX3RvZ2dsZUNvbnNvbGVCdXR0b25DbGlja2VkOiBmdW5jdGlvbigpCiAgICAgewog ICAgICAgICB0aGlzLmRyYXdlci52aXNpYmxlVmlldyA9IHRoaXM7CkBAIC0xOTIsNyArMTkxLDcg QEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIGFmdGVyU2hv dzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLmN1cnJlbnRGb2N1c0Vs ZW1lbnQgPSB0aGlzLnByb21wdEVsZW1lbnQ7ICAKKyAgICAgICAgV2ViSW5zcGVjdG9yLmN1cnJl bnRGb2N1c0VsZW1lbnQgPSB0aGlzLnByb21wdEVsZW1lbnQ7CiAgICAgfSwKIAogICAgIGhpZGU6 IGZ1bmN0aW9uKCkKQEAgLTIzMCwxNyArMjI5LDEyIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmll dy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMubWVzc2FnZXMucHVzaChtc2cpOwogCiAgICAg ICAgIGlmIChtc2cudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VU eXBlLkVuZEdyb3VwKSB7Ci0gICAgICAgICAgICBpZiAodGhpcy5ncm91cExldmVsIDwgMSkKLSAg ICAgICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgICAgIHRoaXMuZ3JvdXBMZXZlbC0tOwot Ci0gICAgICAgICAgICB0aGlzLmN1cnJlbnRHcm91cCA9IHRoaXMuY3VycmVudEdyb3VwLnBhcmVu dEdyb3VwOworICAgICAgICAgICAgdmFyIHBhcmVudEdyb3VwID0gdGhpcy5jdXJyZW50R3JvdXAu cGFyZW50R3JvdXAKKyAgICAgICAgICAgIGlmIChwYXJlbnRHcm91cCkKKyAgICAgICAgICAgICAg ICB0aGlzLmN1cnJlbnRHcm91cCA9IHBhcmVudEdyb3VwOwogICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgaWYgKG1zZy50eXBlID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVz c2FnZVR5cGUuU3RhcnRHcm91cCB8fCBtc2cudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VUeXBlLlN0YXJ0R3JvdXBDb2xsYXBzZWQpIHsKLSAgICAgICAgICAgICAg ICB0aGlzLmdyb3VwTGV2ZWwrKzsKLQotICAgICAgICAgICAgICAgIHZhciBncm91cCA9IG5ldyBX ZWJJbnNwZWN0b3IuQ29uc29sZUdyb3VwKHRoaXMuY3VycmVudEdyb3VwLCB0aGlzLmdyb3VwTGV2 ZWwpOworICAgICAgICAgICAgICAgIHZhciBncm91cCA9IG5ldyBXZWJJbnNwZWN0b3IuQ29uc29s ZUdyb3VwKHRoaXMuY3VycmVudEdyb3VwKTsKICAgICAgICAgICAgICAgICB0aGlzLmN1cnJlbnRH cm91cC5tZXNzYWdlc0VsZW1lbnQuYXBwZW5kQ2hpbGQoZ3JvdXAuZWxlbWVudCk7CiAgICAgICAg ICAgICAgICAgdGhpcy5jdXJyZW50R3JvdXAgPSBncm91cDsKICAgICAgICAgICAgIH0KQEAgLTI1 NSw3ICsyNDksNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAg IHsKICAgICAgICAgdmFyIG1zZyA9IHRoaXMucHJldmlvdXNNZXNzYWdlOwogICAgICAgICB2YXIg cHJldlJlcGVhdENvdW50ID0gbXNnLnRvdGFsUmVwZWF0Q291bnQ7Ci0gICAgICAgIAorCiAgICAg ICAgIGlmICghdGhpcy5jb21tYW5kU2luY2VQcmV2aW91c01lc3NhZ2UpIHsKICAgICAgICAgICAg IG1zZy5yZXBlYXREZWx0YSA9IGNvdW50IC0gcHJldlJlcGVhdENvdW50OwogICAgICAgICAgICAg bXNnLnJlcGVhdENvdW50ID0gbXNnLnJlcGVhdENvdW50ICsgbXNnLnJlcGVhdERlbHRhOwpAQCAt MjYzLDcgKzI1Nyw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICBtc2cuX3VwZGF0ZVJlcGVhdENvdW50KCk7CiAgICAgICAgICAgICB0aGlzLl9p bmNyZW1lbnRFcnJvcldhcm5pbmdDb3VudChtc2cpOwogICAgICAgICB9IGVsc2UgewotICAgICAg ICAgICAgdmFyIG1zZ0NvcHkgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlKG1zZy5z b3VyY2UsIG1zZy50eXBlLCBtc2cubGV2ZWwsIG1zZy5saW5lLCBtc2cudXJsLCBtc2cuZ3JvdXBM ZXZlbCwgY291bnQgLSBwcmV2UmVwZWF0Q291bnQsIG1zZy5fbWVzc2FnZVRleHQsIG1zZy5fcGFy YW1ldGVycywgbXNnLl9zdGFja1RyYWNlKTsKKyAgICAgICAgICAgIHZhciBtc2dDb3B5ID0gbmV3 IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZShtc2cuc291cmNlLCBtc2cudHlwZSwgbXNnLmxl dmVsLCBtc2cubGluZSwgbXNnLnVybCwgY291bnQgLSBwcmV2UmVwZWF0Q291bnQsIG1zZy5fbWVz c2FnZVRleHQsIG1zZy5fcGFyYW1ldGVycywgbXNnLl9zdGFja1RyYWNlKTsKICAgICAgICAgICAg IG1zZ0NvcHkudG90YWxSZXBlYXRDb3VudCA9IGNvdW50OwogICAgICAgICAgICAgbXNnQ29weS5f Zm9ybWF0TWVzc2FnZSgpOwogICAgICAgICAgICAgdGhpcy5hZGRNZXNzYWdlKG1zZ0NvcHkpOwpA QCAtMjkzLDcgKzI4Nyw2IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7 CiAKICAgICAgICAgdGhpcy5tZXNzYWdlcyA9IFtdOwogCi0gICAgICAgIHRoaXMuZ3JvdXBMZXZl bCA9IDA7CiAgICAgICAgIHRoaXMuY3VycmVudEdyb3VwID0gdGhpcy50b3BHcm91cDsKICAgICAg ICAgdGhpcy50b3BHcm91cC5tZXNzYWdlc0VsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKIApAQCAt NjM0LDE0ICs2MjcsMTMgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsK IAogV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNw ZWN0b3IuVmlldy5wcm90b3R5cGU7CiAKLVdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZSA9IGZ1 bmN0aW9uKHNvdXJjZSwgdHlwZSwgbGV2ZWwsIGxpbmUsIHVybCwgZ3JvdXBMZXZlbCwgcmVwZWF0 Q291bnQsIG1lc3NhZ2UsIHBhcmFtZXRlcnMsIHN0YWNrVHJhY2UpCitXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UgPSBmdW5jdGlvbihzb3VyY2UsIHR5cGUsIGxldmVsLCBsaW5lLCB1cmwsIHJl cGVhdENvdW50LCBtZXNzYWdlLCBwYXJhbWV0ZXJzLCBzdGFja1RyYWNlKQogewogICAgIHRoaXMu c291cmNlID0gc291cmNlOwogICAgIHRoaXMudHlwZSA9IHR5cGU7CiAgICAgdGhpcy5sZXZlbCA9 IGxldmVsOwogICAgIHRoaXMubGluZSA9IGxpbmU7CiAgICAgdGhpcy51cmwgPSB1cmw7Ci0gICAg dGhpcy5ncm91cExldmVsID0gZ3JvdXBMZXZlbDsKICAgICB0aGlzLnJlcGVhdENvdW50ID0gcmVw ZWF0Q291bnQ7CiAgICAgdGhpcy5yZXBlYXREZWx0YSA9IHJlcGVhdENvdW50OwogICAgIHRoaXMu dG90YWxSZXBlYXRDb3VudCA9IHJlcGVhdENvdW50OwpAQCAtNjU0LDcgKzY0Niw3IEBAIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZSA9IGZ1bmN0aW9uKHNvdXJjZSwgdHlwZSwgbGV2ZWwsIGxp bmUsIHVybCwgZ3JvdXBMZXZlCiBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY3JlYXRlVGV4 dE1lc3NhZ2UgPSBmdW5jdGlvbih0ZXh0LCBsZXZlbCkKIHsKICAgICBsZXZlbCA9IGxldmVsIHx8 IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuTG9nOwotICAgIHJldHVy biBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlKFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZS5NZXNzYWdlU291cmNlLkpTLCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2Fn ZVR5cGUuTG9nLCBsZXZlbCwgMCwgbnVsbCwgbnVsbCwgMSwgbnVsbCwgW3RleHRdLCBudWxsKTsK KyAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZShXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5KUywgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLk1lc3NhZ2VUeXBlLkxvZywgbGV2ZWwsIDAsIG51bGwsIDEsIG51bGwsIFt0ZXh0XSwgbnVs bCk7CiB9CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CkBAIC03 OTAsMjcgKzc4Miw2IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7 CiAKICAgICAgICAgdGhpcy5fZWxlbWVudCA9IGVsZW1lbnQ7CiAKLSAgICAgICAgc3dpdGNoICh0 aGlzLnNvdXJjZSkgewotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2UuTWVzc2FnZVNvdXJjZS5IVE1MOgotICAgICAgICAgICAgICAgIGVsZW1lbnQuYWRkU3R5bGVD bGFzcygiY29uc29sZS1odG1sLXNvdXJjZSIpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5X TUw6Ci0gICAgICAgICAgICAgICAgZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJjb25zb2xlLXdtbC1z b3VyY2UiKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5z cGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UuWE1MOgotICAgICAgICAgICAgICAg IGVsZW1lbnQuYWRkU3R5bGVDbGFzcygiY29uc29sZS14bWwtc291cmNlIik7Ci0gICAgICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5NZXNzYWdlU291cmNlLkpTOgotICAgICAgICAgICAgICAgIGVsZW1lbnQuYWRkU3R5bGVDbGFz cygiY29uc29sZS1qcy1zb3VyY2UiKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAg ICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UuQ1NTOgot ICAgICAgICAgICAgICAgIGVsZW1lbnQuYWRkU3R5bGVDbGFzcygiY29uc29sZS1jc3Mtc291cmNl Iik7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rv ci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlU291cmNlLk90aGVyOgotICAgICAgICAgICAgICAgIGVs ZW1lbnQuYWRkU3R5bGVDbGFzcygiY29uc29sZS1vdGhlci1zb3VyY2UiKTsKLSAgICAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgfQotCiAgICAgICAgIHN3aXRjaCAodGhpcy5sZXZlbCkgewog ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVs LlRpcDoKICAgICAgICAgICAgICAgICBlbGVtZW50LmFkZFN0eWxlQ2xhc3MoImNvbnNvbGUtdGlw LWxldmVsIik7CkBAIC04NzQsNyArODQ1LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl LnByb3RvdHlwZSA9IHsKICAgICBfYWRkTWVzc2FnZUhlYWRlcjogZnVuY3Rpb24ocGFyZW50RWxl bWVudCwgZm9ybWF0dGVkTWVzc2FnZSkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLnVybCAmJiB0 aGlzLnVybCAhPT0gInVuZGVmaW5lZCIpIHsKLSAgICAgICAgICAgIHZhciB1cmxFbGVtZW50ID0g V2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNvdXJjZUFzTm9kZSh0aGlzLnVybCwgInNjcmlwdHMiLCB0 aGlzLmxpbmUsICJjb25zb2xlLW1lc3NhZ2UtdXJsIik7IAorICAgICAgICAgICAgdmFyIHVybEVs ZW1lbnQgPSBXZWJJbnNwZWN0b3IubGlua2lmeVJlc291cmNlQXNOb2RlKHRoaXMudXJsLCAic2Ny aXB0cyIsIHRoaXMubGluZSwgImNvbnNvbGUtbWVzc2FnZS11cmwiKTsKICAgICAgICAgICAgIHBh cmVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodXJsRWxlbWVudCk7CiAgICAgICAgIH0KIApAQCAtODkw LDcgKzg2MSw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgIGlmICghdGhpcy5yZXBlYXRDb3VudEVsZW1lbnQpIHsKICAgICAgICAgICAgIHRoaXMu cmVwZWF0Q291bnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwogICAg ICAgICAgICAgdGhpcy5yZXBlYXRDb3VudEVsZW1lbnQuY2xhc3NOYW1lID0gImJ1YmJsZSI7Ci0g ICAgCisKICAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuaW5zZXJ0QmVmb3JlKHRoaXMucmVwZWF0 Q291bnRFbGVtZW50LCB0aGlzLl9lbGVtZW50LmZpcnN0Q2hpbGQpOwogICAgICAgICAgICAgdGhp cy5fZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJyZXBlYXRlZC1tZXNzYWdlIik7CiAgICAgICAgIH0K QEAgLTk0Nyw3ICs5MTgsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBl ID0gewogICAgICAgICAgICAgICAgIHR5cGVTdHJpbmcgPSAiUmVzdWx0IjsKICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgfQotICAgICAgICAKKwogICAgICAgICB2YXIgbGV2ZWxTdHJp bmc7CiAgICAgICAgIHN3aXRjaCAodGhpcy5sZXZlbCkgewogICAgICAgICAgICAgY2FzZSBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLlRpcDoKQEAgLTk3NSwxNCArOTQ2 LDEyIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CiAgICAgICAg IGlmICghbXNnKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgICAgIHZhciByZXQg PSAodGhpcy5zb3VyY2UgPT0gbXNnLnNvdXJjZSkKLSAgICAgICAgICAgICYmICh0aGlzLnR5cGUg PT0gbXNnLnR5cGUpCi0gICAgICAgICAgICAmJiAodGhpcy5sZXZlbCA9PSBtc2cubGV2ZWwpCi0g ICAgICAgICAgICAmJiAodGhpcy5saW5lID09IG1zZy5saW5lKQotICAgICAgICAgICAgJiYgKHRo aXMudXJsID09IG1zZy51cmwpCi0gICAgICAgICAgICAmJiAodGhpcy5tZXNzYWdlID09IG1zZy5t ZXNzYWdlKTsKLQotICAgICAgICByZXR1cm4gKGRpc3JlZ3VhcmRHcm91cCA/IHJldCA6IChyZXQg JiYgKHRoaXMuZ3JvdXBMZXZlbCA9PSBtc2cuZ3JvdXBMZXZlbCkpKTsKKyAgICAgICAgcmV0dXJu ICh0aGlzLnNvdXJjZSA9PT0gbXNnLnNvdXJjZSkKKyAgICAgICAgICAgICYmICh0aGlzLnR5cGUg PT09IG1zZy50eXBlKQorICAgICAgICAgICAgJiYgKHRoaXMubGV2ZWwgPT09IG1zZy5sZXZlbCkK KyAgICAgICAgICAgICYmICh0aGlzLmxpbmUgPT09IG1zZy5saW5lKQorICAgICAgICAgICAgJiYg KHRoaXMudXJsID09PSBtc2cudXJsKQorICAgICAgICAgICAgJiYgKHRoaXMubWVzc2FnZSA9PT0g bXNnLm1lc3NhZ2UpOwogICAgIH0KIH0KIApAQCAtMTA1NSwxMCArMTAyNCw5IEBAIFdlYkluc3Bl Y3Rvci5Db25zb2xlQ29tbWFuZFJlc3VsdC5wcm90b3R5cGUgPSB7CiAKIFdlYkluc3BlY3Rvci5D b25zb2xlQ29tbWFuZFJlc3VsdC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkNv bnNvbGVNZXNzYWdlLnByb3RvdHlwZTsKIAotV2ViSW5zcGVjdG9yLkNvbnNvbGVHcm91cCA9IGZ1 bmN0aW9uKHBhcmVudEdyb3VwLCBsZXZlbCkKK1dlYkluc3BlY3Rvci5Db25zb2xlR3JvdXAgPSBm dW5jdGlvbihwYXJlbnRHcm91cCkKIHsKICAgICB0aGlzLnBhcmVudEdyb3VwID0gcGFyZW50R3Jv dXA7Ci0gICAgdGhpcy5sZXZlbCA9IGxldmVsOwogCiAgICAgdmFyIGVsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICBlbGVtZW50LmNsYXNzTmFtZSA9ICJjb25zb2xl LWdyb3VwIjsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwppbmRleCBhZWZk ZDZjNjIxMjVmNTNlYWQ5MWUzMzJkZDkwMDFkYjQ4NWYyN2QyLi5kMDNhNjg0Zjc3MGEwNmNiYjc1 MTdiNGI1OWE1YjkyNTk3OTVjY2I0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2UuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlLmpzCkBAIC02MDgsNyArNjA4LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5NZXNzYWdlTGV2ZWwuV2FybmluZywKICAgICAgICAgICAgICAgICAgICAgICAgIC0xLAogICAg ICAgICAgICAgICAgICAgICAgICAgdGhpcy51cmwsCi0gICAgICAgICAgICAgICAgICAgICAgICBu dWxsLAogICAgICAgICAgICAgICAgICAgICAgICAgMSwKICAgICAgICAgICAgICAgICAgICAgICAg IFN0cmluZy5zcHJpbnRmKFdlYkluc3BlY3Rvci5XYXJuaW5ncy5JbmNvcnJlY3RNSU1FVHlwZS5t ZXNzYWdlLCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS50b1VJU3RyaW5nKHRoaXMudHlwZSks IHRoaXMubWltZVR5cGUpLAogICAgICAgICAgICAgICAgICAgICAgICAgbnVsbCwKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwppbmRleCA4ZTA3N2NkMjllODg1MTBm NmI3NTUyYTEyNGI3M2VjNjQ2ZjE1ZjA4Li45MjA4ODFmZjExNzhlOWQzMTM1ZDk4ZjU3MjA3MzE2 NDI0OTAwYmU5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNl RnJhbWUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpz CkBAIC0zOTUsNyArMzk1LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9 IHsKICAgICAgICAgfQogCiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcm93TWVzc2FnZXMu bGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIGlmIChyb3dNZXNzYWdlc1tpXS5pc0VxdWFsKG1z ZywgdHJ1ZSkpIHsKKyAgICAgICAgICAgIGlmIChyb3dNZXNzYWdlc1tpXS5pc0VxdWFsKG1zZykp IHsKICAgICAgICAgICAgICAgICB0aGlzLl9pbmNyZW1lbnRNZXNzYWdlUmVwZWF0Q291bnQocm93 TWVzc2FnZXNbaV0sIG1zZy5yZXBlYXREZWx0YSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5k ZXggZjcxYjg5YTYwY2VhNzQ3MjAyMTg2NzY0YzkyZGI0NGE1OWZlZDJkNS4uNjc2ZGVlNjBhYWNi YzRlZGZiMmQ0NGJlMTQwMzdlODZhMWEwOWM3ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzCkBAIC0xMzgzLDcgKzEzODMsNiBAQCBXZWJJbnNwZWN0b3IuYWRkQ29u c29sZU1lc3NhZ2UgPSBmdW5jdGlvbihwYXlsb2FkKQogICAgICAgICBwYXlsb2FkLmxldmVsLAog ICAgICAgICBwYXlsb2FkLmxpbmUsCiAgICAgICAgIHBheWxvYWQudXJsLAotICAgICAgICBwYXls b2FkLmdyb3VwTGV2ZWwsCiAgICAgICAgIHBheWxvYWQucmVwZWF0Q291bnQsCiAgICAgICAgIHBh eWxvYWQubWVzc2FnZSwKICAgICAgICAgcGF5bG9hZC5wYXJhbWV0ZXJzLApAQCAtMTQ1Myw3ICsx NDUyLDYgQEAgV2ViSW5zcGVjdG9yLmxvZyA9IGZ1bmN0aW9uKG1lc3NhZ2UsIG1lc3NhZ2VMZXZl bCkKICAgICAgICAgICAgIG1lc3NhZ2VMZXZlbCB8fCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2UuTWVzc2FnZUxldmVsLkRlYnVnLAogICAgICAgICAgICAgLTEsCiAgICAgICAgICAgICBudWxs LAotICAgICAgICAgICAgbnVsbCwKICAgICAgICAgICAgIHJlcGVhdENvdW50LAogICAgICAgICAg ICAgbnVsbCwKICAgICAgICAgICAgIFttZXNzYWdlXSwK