55621 2011-03-02 14:58:45 -0800 Remove "register slot" concept from PropertySlot 2011-03-02 16:00:44 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 oliver oliver oldest_to_newest 361099 0 oliver 2011-03-02 14:58:45 -0800 Remove "register slot" concept from PropertySlot 361103 1 84472 oliver 2011-03-02 15:05:21 -0800 Created attachment 84472 Patch 361133 2 84472 barraclough 2011-03-02 15:49:22 -0800 Comment on attachment 84472 Patch I'm assuming the JavaScriptCore.xcodeproj/project.pbxproj change is bogus? - please revert before landing, assuming so. 361141 3 oliver 2011-03-02 16:00:44 -0800 Committed r80179: <http://trac.webkit.org/changeset/80179> 84472 2011-03-02 15:05:21 -0800 2011-03-02 15:49:22 -0800 Patch bug-55621-20110302150520.patch text/plain 9623 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogODAxNTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDk0 MzcyOWJjOTI1NjIxZWFhN2U2ZWEyYTY4ZjA5MWYxMzFlNGE0MDIuLmU5OTQ0Y2NkMTY4ZjYxMmVm MWM1YjkyNzhlNjEyODUzODljZDBkYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDM4IEBACisyMDExLTAzLTAyICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlICJy ZWdpc3RlciBzbG90IiBjb25jZXB0IGZyb20gUHJvcGVydHlTbG90CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTYyMQorCisgICAgICAgIFByb3BlcnR5 U2xvdCBoYWQgYWxyZWFkeSBzdG9wcGVkIHN0b3JpbmcgUmVnaXN0ZXIgInNsb3RzIgorICAgICAg ICBzbyB0aGlzIHBhdGNoIGlzIHNpbXBseSByZW1vdmluZyB0aGF0IGFwaSBlbnRpcmVseS4KKyAg ICAgICAgVGhpcyBleHBvc2VkIGEgcHJvYmxlbSBpbiB0aGUgUHJvZ3JhbU5vZGUgY29uc3RydWN0 b3IgZm9yCisgICAgICAgIEJ5dGVjb2RlR2VuZXJhdG9yIHdoZXJlIGl0IHJlYWRzIGZyb20gdGhl IHJlZ2lzdGVyZmlsZQorICAgICAgICBiZWZvcmUgaXQgaGFzIGluaXRpYWxpc2VkIGl0LgorCisg ICAgICAgIFRoaXMgYnVnIHdhc24ndCBhIHByb2JsZW0gYmVmb3JlIGFzIHdlIHdlcmUgbWVyZWx5 IHRlc3RpbmcKKyAgICAgICAgZm9yIHByb3BlcnR5IGV4aXN0ZW5jZSByYXRoZXIgdGhhbiB0aGUg YWN0dWFsIHZhbHVlLCBhbmQKKyAgICAgICAgdXNlZCB0byB3b3JrIGJlY2F1c2Ugc2V0UmVnaXN0 ZXJTbG90IGRpZG4ndCBjaGVjayB0aGF0IHRoZQorICAgICAgICBwcm92aWRlZCBzbG90IGNvbnRh aW5lZCBhbiBpbml0aWFsaXNlZCB2YWx1ZS4KKworICAgICAgICBUbyBnZXQgYXJvdW5kIHRoaXMg aXNzdWUgd2Ugbm93IHVzZSBzeW1ib2xUYWJsZUhhc1Byb3BlcnR5CisgICAgICAgIHRvIGRvIHRo ZSBzeW1ib2wgdGFibGUgY2hlY2sgd2l0aG91dCB0cnlpbmcgdG8gcmVhZCB0aGUKKyAgICAgICAg UmVnaXN0ZXJGaWxlLgorCisgICAgICAgICogSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvajoKKyAgICAgICAgKiBieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3Bw OgorICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6Qnl0ZWNvZGVHZW5lcmF0b3IpOgor ICAgICAgICAqIHJ1bnRpbWUvQXJndW1lbnRzLmNwcDoKKyAgICAgICAgKEpTQzo6QXJndW1lbnRz OjpnZXRPd25Qcm9wZXJ0eVNsb3QpOgorICAgICAgICAqIHJ1bnRpbWUvSlNBY3RpdmF0aW9uLmNw cDoKKyAgICAgICAgKEpTQzo6SlNBY3RpdmF0aW9uOjpzeW1ib2xUYWJsZUdldCk6CisgICAgICAg ICogcnVudGltZS9KU0dsb2JhbE9iamVjdC5oOgorICAgICAgICAoSlNDOjpKU0dsb2JhbE9iamVj dDo6c3ltYm9sVGFibGVIYXNQcm9wZXJ0eSk6CisgICAgICAgICogcnVudGltZS9KU1ZhcmlhYmxl T2JqZWN0Lmg6CisgICAgICAgIChKU0M6OkpTVmFyaWFibGVPYmplY3Q6OnN5bWJvbFRhYmxlR2V0 KToKKyAgICAgICAgKiBydW50aW1lL1Byb3BlcnR5U2xvdC5oOgorCiAyMDExLTAzLTAyICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRy aSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRD b3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2 YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCBlNjIwM2FjMmUxNzFm MTU0OTNkMWVhNGU5ZDcyYjM0ZGEwOWJiNzYwLi40N2ViNGUyM2U4OGM5MzQ0NTgyYzlhNDMwNDU3 ZmFmZTExMmQyNTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlw dENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMjUzOSw2ICsy NTM5LDcgQEAKIAkJCX07CiAJCQlidWlsZENvbmZpZ3VyYXRpb25MaXN0ID0gMTQ5QzI3NzEwODkw MkFGRTAwOEE5RUZDIC8qIEJ1aWxkIGNvbmZpZ3VyYXRpb24gbGlzdCBmb3IgUEJYUHJvamVjdCAi SmF2YVNjcmlwdENvcmUiICovOwogCQkJY29tcGF0aWJpbGl0eVZlcnNpb24gPSAiWGNvZGUgMy4x IjsKKwkJCWRldmVsb3BtZW50UmVnaW9uID0gRW5nbGlzaDsKIAkJCWhhc1NjYW5uZWRGb3JFbmNv ZGluZ3MgPSAxOwogCQkJa25vd25SZWdpb25zID0gKAogCQkJCUVuZ2xpc2gsCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3Iu Y3BwCmluZGV4IGMzNDRlZGM4NDYyNWU4NmQ3M2M3NmRmNGUxODIxZmM2MGRkODQzODcuLjA4ZjRi ZDRmN2ViNmFmZjg3MTZjNzFmNTkxYzIzMTJkZWViMTI5NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCkBA IC0yNzAsOCArMjcwLDkgQEAgQnl0ZWNvZGVHZW5lcmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKFBy b2dyYW1Ob2RlKiBwcm9ncmFtTm9kZSwgU2NvcGVDaGFpbk5vZGUqIHMKIAogICAgICAgICBWZWN0 b3I8UmVnaXN0ZXJJRCosIDMyPiBuZXdWYXJzOwogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsg aSA8IHZhclN0YWNrLnNpemUoKTsgKytpKSB7Ci0gICAgICAgICAgICBpZiAoIWdsb2JhbE9iamVj dC0+aGFzUHJvcGVydHkoZXhlYywgKnZhclN0YWNrW2ldLmZpcnN0KSkKLSAgICAgICAgICAgICAg ICBuZXdWYXJzLmFwcGVuZChhZGRHbG9iYWxWYXIoKnZhclN0YWNrW2ldLmZpcnN0LCB2YXJTdGFj a1tpXS5zZWNvbmQgJiBEZWNsYXJhdGlvblN0YWNrczo6SXNDb25zdGFudCkpOworICAgICAgICAg ICAgaWYgKGdsb2JhbE9iamVjdC0+c3ltYm9sVGFibGVIYXNQcm9wZXJ0eSgqdmFyU3RhY2tbaV0u Zmlyc3QpIHx8IGdsb2JhbE9iamVjdC0+aGFzUHJvcGVydHkoZXhlYywgKnZhclN0YWNrW2ldLmZp cnN0KSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIG5ld1ZhcnMuYXBw ZW5kKGFkZEdsb2JhbFZhcigqdmFyU3RhY2tbaV0uZmlyc3QsIHZhclN0YWNrW2ldLnNlY29uZCAm IERlY2xhcmF0aW9uU3RhY2tzOjpJc0NvbnN0YW50KSk7CiAgICAgICAgIH0KIAogICAgICAgICBn bG9iYWxPYmplY3QtPnJlc2l6ZVJlZ2lzdGVycyhvbGRTeW1ib2xUYWJsZVNpemUsIHN5bWJvbFRh YmxlLT5zaXplKCkpOwpAQCAtMjg2LDcgKzI4Nyw3IEBAIEJ5dGVjb2RlR2VuZXJhdG9yOjpCeXRl Y29kZUdlbmVyYXRvcihQcm9ncmFtTm9kZSogcHJvZ3JhbU5vZGUsIFNjb3BlQ2hhaW5Ob2RlKiBz CiAgICAgICAgICAgICBnbG9iYWxPYmplY3QtPnB1dFdpdGhBdHRyaWJ1dGVzKGV4ZWMsIGZ1bmN0 aW9uLT5pZGVudCgpLCBuZXcgKGV4ZWMpIEpTRnVuY3Rpb24oZXhlYywgbWFrZUZ1bmN0aW9uKGV4 ZWMsIGZ1bmN0aW9uKSwgc2NvcGVDaGFpbiksIERvbnREZWxldGUpOwogICAgICAgICB9CiAgICAg ICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgdmFyU3RhY2suc2l6ZSgpOyArK2kpIHsKLSAgICAg ICAgICAgIGlmIChnbG9iYWxPYmplY3QtPmhhc1Byb3BlcnR5KGV4ZWMsICp2YXJTdGFja1tpXS5m aXJzdCkpCisgICAgICAgICAgICBpZiAoZ2xvYmFsT2JqZWN0LT5zeW1ib2xUYWJsZUhhc1Byb3Bl cnR5KCp2YXJTdGFja1tpXS5maXJzdCkgfHwgZ2xvYmFsT2JqZWN0LT5oYXNQcm9wZXJ0eShleGVj LCAqdmFyU3RhY2tbaV0uZmlyc3QpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICAgICAgaW50IGF0dHJpYnV0ZXMgPSBEb250RGVsZXRlOwogICAgICAgICAgICAgaWYgKHZhclN0 YWNrW2ldLnNlY29uZCAmIERlY2xhcmF0aW9uU3RhY2tzOjpJc0NvbnN0YW50KQpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQXJndW1lbnRzLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0FyZ3VtZW50cy5jcHAKaW5kZXggMzAzMTM2NWQ0MTY1ZGI1 YTQ3MTY2YjRiNGQwYmM0ZjU5NzBlYTlmMi4uYmFmOWI1Mzc5NGI0ZTk1YzVkMjhhODU2M2ZkZGZi NzczYjA2ZTdjOCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQXJn dW1lbnRzLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Bcmd1bWVudHMu Y3BwCkBAIC0xNDUsNyArMTQ1LDcgQEAgYm9vbCBBcmd1bWVudHM6OmdldE93blByb3BlcnR5U2xv dChFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVkIGksIFByb3BlcnR5U2xvdCYgc2wKIHsKICAgICBp ZiAoaSA8IGQtPm51bUFyZ3VtZW50cyAmJiAoIWQtPmRlbGV0ZWRBcmd1bWVudHMgfHwgIWQtPmRl bGV0ZWRBcmd1bWVudHNbaV0pKSB7CiAgICAgICAgIGlmIChpIDwgZC0+bnVtUGFyYW1ldGVycykg ewotICAgICAgICAgICAgc2xvdC5zZXRSZWdpc3RlclNsb3QoJmQtPnJlZ2lzdGVyc1tkLT5maXJz dFBhcmFtZXRlckluZGV4ICsgaV0pOworICAgICAgICAgICAgc2xvdC5zZXRWYWx1ZShkLT5yZWdp c3RlcnNbZC0+Zmlyc3RQYXJhbWV0ZXJJbmRleCArIGldLmpzVmFsdWUoKSk7CiAgICAgICAgIH0g ZWxzZQogICAgICAgICAgICAgc2xvdC5zZXRWYWx1ZShkLT5leHRyYUFyZ3VtZW50c1tpIC0gZC0+ bnVtUGFyYW1ldGVyc10uanNWYWx1ZSgpKTsKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0xODQs NyArMTg0LDcgQEAgYm9vbCBBcmd1bWVudHM6OmdldE93blByb3BlcnR5U2xvdChFeGVjU3RhdGUq IGV4ZWMsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmEKICAgICB1bnNpZ25lZCBpID0gcHJv cGVydHlOYW1lLnRvQXJyYXlJbmRleChpc0FycmF5SW5kZXgpOwogICAgIGlmIChpc0FycmF5SW5k ZXggJiYgaSA8IGQtPm51bUFyZ3VtZW50cyAmJiAoIWQtPmRlbGV0ZWRBcmd1bWVudHMgfHwgIWQt PmRlbGV0ZWRBcmd1bWVudHNbaV0pKSB7CiAgICAgICAgIGlmIChpIDwgZC0+bnVtUGFyYW1ldGVy cykgewotICAgICAgICAgICAgc2xvdC5zZXRSZWdpc3RlclNsb3QoJmQtPnJlZ2lzdGVyc1tkLT5m aXJzdFBhcmFtZXRlckluZGV4ICsgaV0pOworICAgICAgICAgICAgc2xvdC5zZXRWYWx1ZShkLT5y ZWdpc3RlcnNbZC0+Zmlyc3RQYXJhbWV0ZXJJbmRleCArIGldLmpzVmFsdWUoKSk7CiAgICAgICAg IH0gZWxzZQogICAgICAgICAgICAgc2xvdC5zZXRWYWx1ZShkLT5leHRyYUFyZ3VtZW50c1tpIC0g ZC0+bnVtUGFyYW1ldGVyc10uanNWYWx1ZSgpKTsKICAgICAgICAgcmV0dXJuIHRydWU7CmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FjdGl2YXRpb24uY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNBY3RpdmF0aW9uLmNwcAppbmRleCBhY2Ux MDljMzZiMGU1NTU5Y2I1MjFhYjQ4OTg1NTc5NzAxMmMxNzdhLi43ODNmOWNlMDY0ZTkzNTlmZWM5 N2ZkOTg0MGZhM2FiZWFlNDhiZTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9KU0FjdGl2YXRpb24uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTQWN0aXZhdGlvbi5jcHAKQEAgLTc1LDcgKzc1LDcgQEAgaW5saW5lIGJvb2wgSlNBY3Rp dmF0aW9uOjpzeW1ib2xUYWJsZUdldChjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIFBy b3BlcnQKICAgICBTeW1ib2xUYWJsZUVudHJ5IGVudHJ5ID0gc3ltYm9sVGFibGUoKS5pbmxpbmVH ZXQocHJvcGVydHlOYW1lLmltcGwoKSk7CiAgICAgaWYgKCFlbnRyeS5pc051bGwoKSkgewogICAg ICAgICBBU1NFUlQoZW50cnkuZ2V0SW5kZXgoKSA8IHN0YXRpY19jYXN0PGludD4oZCgpLT5mdW5j dGlvbkV4ZWN1dGFibGUtPmNhcHR1cmVkVmFyaWFibGVDb3VudCgpKSk7Ci0gICAgICAgIHNsb3Qu c2V0UmVnaXN0ZXJTbG90KCZyZWdpc3RlckF0KGVudHJ5LmdldEluZGV4KCkpKTsKKyAgICAgICAg c2xvdC5zZXRWYWx1ZShyZWdpc3RlckF0KGVudHJ5LmdldEluZGV4KCkpLmpzVmFsdWUoKSk7CiAg ICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5oIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuaAppbmRleCBjNTY3NWU2MzAw YjcyMjI2YjBiMTE0MjkwZWNlMmNhYzhmM2U4MWM2Li44ZWJiZWQ0Y2E2Y2M1ZDA3MmJlNjMxMDc5 NGZkNTRhY2M2YTJiMjMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU0dsb2JhbE9iamVjdC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT R2xvYmFsT2JqZWN0LmgKQEAgLTE3Nyw2ICsxNzcsMTAgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAg ICAgIHZpcnR1YWwgdm9pZCBkZWZpbmVHZXR0ZXIoRXhlY1N0YXRlKiwgY29uc3QgSWRlbnRpZmll ciYgcHJvcGVydHlOYW1lLCBKU09iamVjdCogZ2V0dGVyRnVuYywgdW5zaWduZWQgYXR0cmlidXRl cyk7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkZWZpbmVTZXR0ZXIoRXhlY1N0YXRlKiwgY29uc3Qg SWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBKU09iamVjdCogc2V0dGVyRnVuYywgdW5zaWduZWQg YXR0cmlidXRlcyk7CiAKKyAgICAgICAgLy8gV2UgdXNlIHRoaXMgaW4gdGhlIGNvZGUgZ2VuZXJh dG9yIGFzIHdlIHBlcmZvcm0gc3ltYm9sIHRhYmxlCisgICAgICAgIC8vIGxvb2t1cHMgcHJpb3Ig dG8gaW5pdGlhbGl6aW5nIHRoZSBwcm9wZXJ0aWVzCisgICAgICAgIGJvb2wgc3ltYm9sVGFibGVI YXNQcm9wZXJ0eShjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUpOworCiAgICAgICAgIC8v IFRoZSBmb2xsb3dpbmcgYWNjZXNzb3JzIHJldHVybiBwcmlzdGluZSB2YWx1ZXMsIGV2ZW4gaWYg YSBzY3JpcHQgCiAgICAgICAgIC8vIHJlcGxhY2VzIHRoZSBnbG9iYWwgb2JqZWN0J3MgYXNzb2Np YXRlZCBwcm9wZXJ0eS4KIApAQCAtMzUxLDYgKzM1NSwxMiBAQCBuYW1lc3BhY2UgSlNDIHsKICAg ICAgICAgcmV0dXJuIHN5bWJvbFRhYmxlR2V0KHByb3BlcnR5TmFtZSwgc2xvdCwgc2xvdElzV3Jp dGVhYmxlKTsKICAgICB9CiAKKyAgICBpbmxpbmUgYm9vbCBKU0dsb2JhbE9iamVjdDo6c3ltYm9s VGFibGVIYXNQcm9wZXJ0eShjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUpCisgICAgewor ICAgICAgICBTeW1ib2xUYWJsZUVudHJ5IGVudHJ5ID0gc3ltYm9sVGFibGUoKS5pbmxpbmVHZXQo cHJvcGVydHlOYW1lLmltcGwoKSk7CisgICAgICAgIHJldHVybiAhZW50cnkuaXNOdWxsKCk7Cisg ICAgfQorCiAgICAgaW5saW5lIEpTVmFsdWUgU3RydWN0dXJlOjpwcm90b3R5cGVGb3JMb29rdXAo RXhlY1N0YXRlKiBleGVjKSBjb25zdAogICAgIHsKICAgICAgICAgaWYgKHR5cGVJbmZvKCkudHlw ZSgpID09IE9iamVjdFR5cGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU1ZhcmlhYmxlT2JqZWN0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U1ZhcmlhYmxlT2JqZWN0LmgKaW5kZXggMTBlMmIzMDI5M2ZhM2JlZDg2ZWY4ZmJjYTkyMGRiYjZh ZWI0NzRlNS4uYWVjODNhMTI1ZmM4NjZkODI2NDUzMWE2MzRmMGJmMTY5OGZlOWYzZiAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNWYXJpYWJsZU9iamVjdC5oCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTVmFyaWFibGVPYmplY3QuaApAQCAt MTA1LDcgKzEwNSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIHsKICAgICAgICAgU3ltYm9sVGFi bGVFbnRyeSBlbnRyeSA9IHN5bWJvbFRhYmxlKCkuaW5saW5lR2V0KHByb3BlcnR5TmFtZS5pbXBs KCkpOwogICAgICAgICBpZiAoIWVudHJ5LmlzTnVsbCgpKSB7Ci0gICAgICAgICAgICBzbG90LnNl dFJlZ2lzdGVyU2xvdCgmcmVnaXN0ZXJBdChlbnRyeS5nZXRJbmRleCgpKSk7CisgICAgICAgICAg ICBzbG90LnNldFZhbHVlKHJlZ2lzdGVyQXQoZW50cnkuZ2V0SW5kZXgoKSkuanNWYWx1ZSgpKTsK ICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiBmYWxz ZTsKQEAgLTExNSw3ICsxMTUsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICB7CiAgICAgICAgIFN5 bWJvbFRhYmxlRW50cnkgZW50cnkgPSBzeW1ib2xUYWJsZSgpLmlubGluZUdldChwcm9wZXJ0eU5h bWUuaW1wbCgpKTsKICAgICAgICAgaWYgKCFlbnRyeS5pc051bGwoKSkgewotICAgICAgICAgICAg c2xvdC5zZXRSZWdpc3RlclNsb3QoJnJlZ2lzdGVyQXQoZW50cnkuZ2V0SW5kZXgoKSkpOworICAg ICAgICAgICAgc2xvdC5zZXRWYWx1ZShyZWdpc3RlckF0KGVudHJ5LmdldEluZGV4KCkpLmpzVmFs dWUoKSk7CiAgICAgICAgICAgICBzbG90SXNXcml0ZWFibGUgPSAhZW50cnkuaXNSZWFkT25seSgp OwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3BlcnR5U2xvdC5oIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvUHJvcGVydHlTbG90LmgKaW5kZXggY2RkYTZmZjY5NmJhOTc2OTAzMTU2 MGU2MGNlYTJhYzE1NDJmYTc4MS4uY2UyOWFjNGU2YzdiYjg1NTUzZTdhYmNiNzk3NDFhZGJhMzYx MDRmMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJvcGVydHlT bG90LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJvcGVydHlTbG90LmgK QEAgLTEyMywxNSArMTIzLDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgICAgICBtX3ZhbHVl ID0gdmFsdWU7CiAgICAgICAgIH0KIAotICAgICAgICB2b2lkIHNldFJlZ2lzdGVyU2xvdChSZWdp c3RlciogcmVnaXN0ZXJTbG90KQotICAgICAgICB7Ci0gICAgICAgICAgICBBU1NFUlQocmVnaXN0 ZXJTbG90KTsKLSAgICAgICAgICAgIGNsZWFyQmFzZSgpOwotICAgICAgICAgICAgY2xlYXJPZmZz ZXQoKTsKLSAgICAgICAgICAgIG1fZ2V0VmFsdWUgPSBKU0NfVkFMVUVfTUFSS0VSOwotICAgICAg ICAgICAgbV92YWx1ZSA9IHJlZ2lzdGVyU2xvdC0+anNWYWx1ZSgpOwotICAgICAgICB9Ci0KICAg ICAgICAgdm9pZCBzZXRDdXN0b20oSlNWYWx1ZSBzbG90QmFzZSwgR2V0VmFsdWVGdW5jIGdldFZh bHVlKQogICAgICAgICB7CiAgICAgICAgICAgICBBU1NFUlQoc2xvdEJhc2UpOwo=