64287 2011-07-11 09:18:38 -0700 Web Inspector: Network panel search needs each resource to have unique identifier. 2011-07-13 07:02:44 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 434919 0 vsevik 2011-07-11 09:18:38 -0700 Network panel search needs each resource to have unique identifier. 434924 1 100310 vsevik 2011-07-11 09:23:43 -0700 Created attachment 100310 Patch 435579 2 100310 loislo 2011-07-12 05:08:22 -0700 Comment on attachment 100310 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100310&action=review > Source/WebCore/inspector/front-end/NetworkPanel.js:1158 > + if (this._matchedResourcesMap[resource.identifier]) { > + this._matchedResourcesMap[oldResource.identifier] = this._matchedResourcesMap[resource.identifier]; > + delete this._matchedResourcesMap[resource.identifier]; > + } > + for (var i = 0; i < this._matchedResources.length; i++) { > + if (this._matchedResources[i] === resource.identifier) > + this._matchedResources[i] = oldResource.identifier; > + } As far as the value in this._matchedResourcesMap[resource.identifier] is the index of resource in this._matchedResources you can use it instead of iterating over this._matchedResources array. 435603 3 100474 vsevik 2011-07-12 06:10:03 -0700 Created attachment 100474 Patch with fixes 435609 4 100477 vsevik 2011-07-12 06:30:08 -0700 Created attachment 100477 Patch with fixes2 436413 5 100477 webkit.review.bot 2011-07-13 07:02:40 -0700 Comment on attachment 100477 Patch with fixes2 Clearing flags on attachment: 100477 Committed r90913: <http://trac.webkit.org/changeset/90913> 436414 6 webkit.review.bot 2011-07-13 07:02:44 -0700 All reviewed patches have been landed. Closing bug. 100310 2011-07-11 09:23:43 -0700 2011-07-12 06:09:56 -0700 Patch bug-64287-20110711202341.patch text/plain 6605 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTA3MzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3NWRhZjdkZjgzODJjNzA2 ZTk0YjEyMjdiM2Q2OTFkMTM0ZjFiYzUwLi4zMTk2YzJhZDlhMDM2YjAxMTIyYzdlYWRhYzU5NmNk ODhiMjc0YWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMTEgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogTmV0d29yayBwYW5lbCBzZWFyY2ggbmVlZHMgZWFjaCByZXNvdXJjZSB0byBoYXZlIHVuaXF1 ZSBpZGVudGlmaWVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQyODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlcik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLnJlcXVlc3RXaWxsQmVTZW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUucmVzb3VyY2VM b2FkZWRGcm9tTWVtb3J5Q2FjaGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNw YXRjaGVyLnByb3RvdHlwZS5fYXBwZW5kUmVkaXJlY3QpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQ YW5lbC5wcm90b3R5cGUuX2FwcGVuZFJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrUGFuZWwucHJvdG90eXBlLl9mcmFtZU5hdmlnYXRlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5fdXBkYXRlU2VhcmNoTWF0Y2hlZExpc3RBZnRl clJlZGlyZWN0KToKKwogMjAxMS0wNy0xMSAgTXVzdGFmaXp1ciBSYWhhbWFuICA8bXVzdGFmLmhl cmVAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdl ci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIu anMKaW5kZXggMWYzNTY2Zjk3YmI2OTU3YTRmY2Q3ZjFkZjhhZGUzOWMwODljM2NmYy4uZDVlMTE5 MGNmZDFmOTkzOGI2MDQ3NGUyZTAwOWIyNjBiMjFhYTk2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCkBAIC01Myw3ICs1 Myw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAg IH0KICAgICAgICAgLy8gRklYTUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02MTM2MyBXZSBzaG91bGQgc2VwYXJhdGUgTmV0d29ya1Jlc291cmNlIChOZXR3b3JrUGFu ZWwgcmVzb3VyY2UpIAogICAgICAgICAvLyBmcm9tIFJlc291cmNlUmV2aXNpb24gKFJlc291cmNl c1BhbmVsL1NjcmlwdHNQYW5lbCByZXNvdXJjZSkgYW5kIHJlcXVlc3QgY29udGVudCBhY2NvcmRp bmdseS4KLSAgICAgICAgaWYgKHJlc291cmNlLmlkZW50aWZpZXIpCisgICAgICAgIGlmIChyZXNv dXJjZS5oYXNOZXR3b3JrRGF0YSkKICAgICAgICAgICAgIE5ldHdvcmtBZ2VudC5nZXRSZXNvdXJj ZUNvbnRlbnQocmVzb3VyY2UuaWRlbnRpZmllciwgY2FsbGJhY2tXcmFwcGVyKTsKICAgICAgICAg ZWxzZQogICAgICAgICAgICAgUGFnZUFnZW50LmdldFJlc291cmNlQ29udGVudChyZXNvdXJjZS5m cmFtZUlkLCByZXNvdXJjZS51cmwsIGNhbGxiYWNrV3JhcHBlcik7CkBAIC03Miw2ICs3Miw3IEBA IFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlciA9IGZ1bmN0aW9uKG1hbmFnZXIpCiAgICAg dGhpcy5fbWFuYWdlciA9IG1hbmFnZXI7CiAgICAgdGhpcy5faW5mbGlnaHRSZXNvdXJjZXNCeUlk ID0ge307CiAgICAgdGhpcy5faW5mbGlnaHRSZXNvdXJjZXNCeVVSTCA9IHt9OworICAgIHRoaXMu X2xhc3RJZGVudGlmaWVyRm9yQ2FjaGVkUmVzb3VyY2UgPSAwOwogICAgIEluc3BlY3RvckJhY2tl bmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyKCJOZXR3b3JrIiwgdGhpcyk7CiB9CiAKQEAgLTEz Myw2ICsxMzQsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlID0g ewogICAgICAgICAgICAgcmVzb3VyY2UgPSB0aGlzLl9hcHBlbmRSZWRpcmVjdChpZGVudGlmaWVy LCB0aW1lLCByZXF1ZXN0LnVybCk7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgcmVzb3Vy Y2UgPSB0aGlzLl9jcmVhdGVSZXNvdXJjZShpZGVudGlmaWVyLCBmcmFtZUlkLCBsb2FkZXJJZCwg cmVxdWVzdC51cmwsIGRvY3VtZW50VVJMLCBzdGFja1RyYWNlKTsKKyAgICAgICAgcmVzb3VyY2Uu aGFzTmV0d29ya0RhdGEgPSB0cnVlOwogICAgICAgICB0aGlzLl91cGRhdGVSZXNvdXJjZVdpdGhS ZXF1ZXN0KHJlc291cmNlLCByZXF1ZXN0KTsKICAgICAgICAgcmVzb3VyY2Uuc3RhcnRUaW1lID0g dGltZTsKIApAQCAtMjA0LDcgKzIwNiw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hl ci5wcm90b3R5cGUgPSB7CiAKICAgICByZXNvdXJjZUxvYWRlZEZyb21NZW1vcnlDYWNoZTogZnVu Y3Rpb24oZnJhbWVJZCwgbG9hZGVySWQsIGRvY3VtZW50VVJMLCB0aW1lLCBjYWNoZWRSZXNvdXJj ZSkKICAgICB7Ci0gICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX2NyZWF0ZVJlc291cmNlKG51 bGwsIGZyYW1lSWQsIGxvYWRlcklkLCBjYWNoZWRSZXNvdXJjZS51cmwsIGRvY3VtZW50VVJMKTsK KyAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5fY3JlYXRlUmVzb3VyY2UoImNhY2hlZDoiICsg Kyt0aGlzLl9sYXN0SWRlbnRpZmllckZvckNhY2hlZFJlc291cmNlLCBmcmFtZUlkLCBsb2FkZXJJ ZCwgY2FjaGVkUmVzb3VyY2UudXJsLCBkb2N1bWVudFVSTCk7CiAgICAgICAgIHRoaXMuX3VwZGF0 ZVJlc291cmNlV2l0aENhY2hlZFJlc291cmNlKHJlc291cmNlLCBjYWNoZWRSZXNvdXJjZSk7CiAg ICAgICAgIHJlc291cmNlLmNhY2hlZCA9IHRydWU7CiAgICAgICAgIHJlc291cmNlLnJlcXVlc3RN ZXRob2QgPSAiR0VUIjsKQEAgLTI3Miw4ICsyNzQsOSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rp c3BhdGNoZXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIG9yaWdpbmFsUmVzb3Vy Y2UgPSB0aGlzLl9pbmZsaWdodFJlc291cmNlc0J5SWRbaWRlbnRpZmllcl07CiAgICAgICAgIHZh ciBwcmV2aW91c1JlZGlyZWN0cyA9IG9yaWdpbmFsUmVzb3VyY2UucmVkaXJlY3RzIHx8IFtdOwot ICAgICAgICBkZWxldGUgb3JpZ2luYWxSZXNvdXJjZS5pZGVudGlmaWVyOworICAgICAgICBvcmln aW5hbFJlc291cmNlLmlkZW50aWZpZXIgPSAicmVkaXJlY3RlZDoiICsgaWRlbnRpZmllciArICIu IiArIHByZXZpb3VzUmVkaXJlY3RzLmxlbmd0aDsKICAgICAgICAgZGVsZXRlIG9yaWdpbmFsUmVz b3VyY2UucmVkaXJlY3RzOworICAgICAgICBvcmlnaW5hbFJlc291cmNlLmhhc05ldHdvcmtEYXRh ID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX2ZpbmlzaFJlc291cmNlKG9yaWdpbmFsUmVzb3VyY2Us IHRpbWUpOwogICAgICAgICB2YXIgbmV3UmVzb3VyY2UgPSB0aGlzLl9jcmVhdGVSZXNvdXJjZShp ZGVudGlmaWVyLCBvcmlnaW5hbFJlc291cmNlLmZyYW1lSWQsIG9yaWdpbmFsUmVzb3VyY2UubG9h ZGVySWQsCiAgICAgICAgICAgICAgcmVkaXJlY3RVUkwsIG9yaWdpbmFsUmVzb3VyY2UuZG9jdW1l bnRVUkwsIG9yaWdpbmFsUmVzb3VyY2Uuc3RhY2tUcmFjZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IGI0YTViNmFkNTZj YjM4YWUzZjRiNGZmNTk3ODFkZTUxOTZhYTgyZmEuLjkzNjYzN2JhMjA0OWRkYjJmMzIyNGMzZGZi ODNlZDY5YTI2ZTI4NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvTmV0d29ya1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvTmV0d29ya1BhbmVsLmpzCkBAIC03NTEsOCArNzUxLDE3IEBAIFdlYkluc3BlY3Rvci5O ZXR3b3JrUGFuZWwucHJvdG90eXBlID0gewogICAgIF9hcHBlbmRSZXNvdXJjZTogZnVuY3Rpb24o cmVzb3VyY2UpCiAgICAgewogICAgICAgICB0aGlzLl9yZXNvdXJjZXMucHVzaChyZXNvdXJjZSk7 Ci0gICAgICAgIGlmIChyZXNvdXJjZS5pZGVudGlmaWVyKQotICAgICAgICAgICAgdGhpcy5fcmVz b3VyY2VzQnlJZFtyZXNvdXJjZS5pZGVudGlmaWVyXSA9IHJlc291cmNlOworICAgICAgICAKKyAg ICAgICAgLy8gSW4gY2FzZSBvZiByZWRpcmVjdCByZXNvdXJjZSBpZGVudGlmaWVyIGlzIHJlYXNz aWduZWQgdG8gYSByZWRpcmVjdGVkIAorICAgICAgICAvLyByZXNvdXJjZSBhbmQgd2UgbmVlZCB0 byB1cGRhdGUgX3Jlc291cmNlc0J5SWQgYW5zIHNlYXJjaCByZXN1bHRzLiAKKyAgICAgICAgaWYg KHRoaXMuX3Jlc291cmNlc0J5SWRbcmVzb3VyY2UuaWRlbnRpZmllcl0pIHsKKyAgICAgICAgICAg IHZhciBvbGRSZXNvdXJjZSA9IHJlc291cmNlLnJlZGlyZWN0c1tyZXNvdXJjZS5yZWRpcmVjdHMu bGVuZ3RoIC0gMV07CisgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZXNCeUlkW29sZFJlc291cmNl LmlkZW50aWZpZXJdID0gb2xkUmVzb3VyY2U7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIHRo aXMuX3VwZGF0ZVNlYXJjaE1hdGNoZWRMaXN0QWZ0ZXJSZWRpcmVjdChyZXNvdXJjZSwgb2xkUmVz b3VyY2UpOworICAgICAgICB9CisgICAgICAgIHRoaXMuX3Jlc291cmNlc0J5SWRbcmVzb3VyY2Uu aWRlbnRpZmllcl0gPSByZXNvdXJjZTsKKyAgICAgICAgCiAgICAgICAgIHRoaXMuX3Jlc291cmNl c0J5VVJMW3Jlc291cmNlLnVybF0gPSByZXNvdXJjZTsKIAogICAgICAgICAvLyBQdWxsIGFsbCB0 aGUgcmVkaXJlY3RzIG9mIHRoZSBtYWluIHJlc291cmNlIHVwb24gY29tbWl0IGxvYWQuCkBAIC03 OTMsNyArODAyLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3Jlc291cmNlcy5sZW5ndGg7ICsr aSkgewogICAgICAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX3Jlc291cmNlc1tpXTsK ICAgICAgICAgICAgICAgICBpZiAocmVzb3VyY2UubG9hZGVySWQgIT09IGxvYWRlcklkKQotICAg ICAgICAgICAgICAgICAgICByZXNvdXJjZS5pZGVudGlmaWVyID0gbnVsbDsKKyAgICAgICAgICAg ICAgICAgICAgcmVzb3VyY2UuaGFzTmV0d29ya0RhdGEgPSBmYWxzZTsKICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQpAQCAtMTEzNyw2ICsxMTQ2LDE4IEBAIFdl Ykluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9oaWdo bGlnaHROdGhNYXRjaGVkUmVzb3VyY2UoLTEsIGZhbHNlKTsKICAgICB9LAogCisgICAgX3VwZGF0 ZVNlYXJjaE1hdGNoZWRMaXN0QWZ0ZXJSZWRpcmVjdDogZnVuY3Rpb24ocmVzb3VyY2UsIG9sZFJl c291cmNlKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX21hdGNoZWRSZXNvdXJjZXNNYXBbcmVz b3VyY2UuaWRlbnRpZmllcl0pIHsKKyAgICAgICAgICAgIHRoaXMuX21hdGNoZWRSZXNvdXJjZXNN YXBbb2xkUmVzb3VyY2UuaWRlbnRpZmllcl0gPSB0aGlzLl9tYXRjaGVkUmVzb3VyY2VzTWFwW3Jl c291cmNlLmlkZW50aWZpZXJdOworICAgICAgICAgICAgZGVsZXRlIHRoaXMuX21hdGNoZWRSZXNv dXJjZXNNYXBbcmVzb3VyY2UuaWRlbnRpZmllcl07CisgICAgICAgIH0KKyAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCB0aGlzLl9tYXRjaGVkUmVzb3VyY2VzLmxlbmd0aDsgaSsrKSB7CisgICAg ICAgICAgICBpZiAodGhpcy5fbWF0Y2hlZFJlc291cmNlc1tpXSA9PT0gcmVzb3VyY2UuaWRlbnRp ZmllcikKKyAgICAgICAgICAgICAgICB0aGlzLl9tYXRjaGVkUmVzb3VyY2VzW2ldID0gb2xkUmVz b3VyY2UuaWRlbnRpZmllcjsKKyAgICAgICAgfQorICAgIH0sCisKICAgICBfdXBkYXRlSGlnaGxp Z2h0SWZNYXRjaGVkOiBmdW5jdGlvbihyZXNvdXJjZSkKICAgICB7CiAgICAgICAgIHZhciBtYXRj aGVkUmVzb3VyY2VJbmRleCA9IHRoaXMuX21hdGNoUmVzb3VyY2UocmVzb3VyY2UpOwo= 100474 2011-07-12 06:10:03 -0700 2011-07-12 06:30:01 -0700 Patch with fixes bug-64287-20110712171001.patch text/plain 6556 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTA3MzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3NWRhZjdkZjgzODJjNzA2 ZTk0YjEyMjdiM2Q2OTFkMTM0ZjFiYzUwLi4zMTk2YzJhZDlhMDM2YjAxMTIyYzdlYWRhYzU5NmNk ODhiMjc0YWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMTEgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogTmV0d29yayBwYW5lbCBzZWFyY2ggbmVlZHMgZWFjaCByZXNvdXJjZSB0byBoYXZlIHVuaXF1 ZSBpZGVudGlmaWVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQyODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlcik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLnJlcXVlc3RXaWxsQmVTZW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUucmVzb3VyY2VM b2FkZWRGcm9tTWVtb3J5Q2FjaGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNw YXRjaGVyLnByb3RvdHlwZS5fYXBwZW5kUmVkaXJlY3QpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQ YW5lbC5wcm90b3R5cGUuX2FwcGVuZFJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrUGFuZWwucHJvdG90eXBlLl9mcmFtZU5hdmlnYXRlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5fdXBkYXRlU2VhcmNoTWF0Y2hlZExpc3RBZnRl clJlZGlyZWN0KToKKwogMjAxMS0wNy0xMSAgTXVzdGFmaXp1ciBSYWhhbWFuICA8bXVzdGFmLmhl cmVAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdl ci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIu anMKaW5kZXggMWYzNTY2Zjk3YmI2OTU3YTRmY2Q3ZjFkZjhhZGUzOWMwODljM2NmYy4uZDVlMTE5 MGNmZDFmOTkzOGI2MDQ3NGUyZTAwOWIyNjBiMjFhYTk2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCkBAIC01Myw3ICs1 Myw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAg IH0KICAgICAgICAgLy8gRklYTUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02MTM2MyBXZSBzaG91bGQgc2VwYXJhdGUgTmV0d29ya1Jlc291cmNlIChOZXR3b3JrUGFu ZWwgcmVzb3VyY2UpIAogICAgICAgICAvLyBmcm9tIFJlc291cmNlUmV2aXNpb24gKFJlc291cmNl c1BhbmVsL1NjcmlwdHNQYW5lbCByZXNvdXJjZSkgYW5kIHJlcXVlc3QgY29udGVudCBhY2NvcmRp bmdseS4KLSAgICAgICAgaWYgKHJlc291cmNlLmlkZW50aWZpZXIpCisgICAgICAgIGlmIChyZXNv dXJjZS5oYXNOZXR3b3JrRGF0YSkKICAgICAgICAgICAgIE5ldHdvcmtBZ2VudC5nZXRSZXNvdXJj ZUNvbnRlbnQocmVzb3VyY2UuaWRlbnRpZmllciwgY2FsbGJhY2tXcmFwcGVyKTsKICAgICAgICAg ZWxzZQogICAgICAgICAgICAgUGFnZUFnZW50LmdldFJlc291cmNlQ29udGVudChyZXNvdXJjZS5m cmFtZUlkLCByZXNvdXJjZS51cmwsIGNhbGxiYWNrV3JhcHBlcik7CkBAIC03Miw2ICs3Miw3IEBA IFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlciA9IGZ1bmN0aW9uKG1hbmFnZXIpCiAgICAg dGhpcy5fbWFuYWdlciA9IG1hbmFnZXI7CiAgICAgdGhpcy5faW5mbGlnaHRSZXNvdXJjZXNCeUlk ID0ge307CiAgICAgdGhpcy5faW5mbGlnaHRSZXNvdXJjZXNCeVVSTCA9IHt9OworICAgIHRoaXMu X2xhc3RJZGVudGlmaWVyRm9yQ2FjaGVkUmVzb3VyY2UgPSAwOwogICAgIEluc3BlY3RvckJhY2tl bmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyKCJOZXR3b3JrIiwgdGhpcyk7CiB9CiAKQEAgLTEz Myw2ICsxMzQsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlID0g ewogICAgICAgICAgICAgcmVzb3VyY2UgPSB0aGlzLl9hcHBlbmRSZWRpcmVjdChpZGVudGlmaWVy LCB0aW1lLCByZXF1ZXN0LnVybCk7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgcmVzb3Vy Y2UgPSB0aGlzLl9jcmVhdGVSZXNvdXJjZShpZGVudGlmaWVyLCBmcmFtZUlkLCBsb2FkZXJJZCwg cmVxdWVzdC51cmwsIGRvY3VtZW50VVJMLCBzdGFja1RyYWNlKTsKKyAgICAgICAgcmVzb3VyY2Uu aGFzTmV0d29ya0RhdGEgPSB0cnVlOwogICAgICAgICB0aGlzLl91cGRhdGVSZXNvdXJjZVdpdGhS ZXF1ZXN0KHJlc291cmNlLCByZXF1ZXN0KTsKICAgICAgICAgcmVzb3VyY2Uuc3RhcnRUaW1lID0g dGltZTsKIApAQCAtMjA0LDcgKzIwNiw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hl ci5wcm90b3R5cGUgPSB7CiAKICAgICByZXNvdXJjZUxvYWRlZEZyb21NZW1vcnlDYWNoZTogZnVu Y3Rpb24oZnJhbWVJZCwgbG9hZGVySWQsIGRvY3VtZW50VVJMLCB0aW1lLCBjYWNoZWRSZXNvdXJj ZSkKICAgICB7Ci0gICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX2NyZWF0ZVJlc291cmNlKG51 bGwsIGZyYW1lSWQsIGxvYWRlcklkLCBjYWNoZWRSZXNvdXJjZS51cmwsIGRvY3VtZW50VVJMKTsK KyAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5fY3JlYXRlUmVzb3VyY2UoImNhY2hlZDoiICsg Kyt0aGlzLl9sYXN0SWRlbnRpZmllckZvckNhY2hlZFJlc291cmNlLCBmcmFtZUlkLCBsb2FkZXJJ ZCwgY2FjaGVkUmVzb3VyY2UudXJsLCBkb2N1bWVudFVSTCk7CiAgICAgICAgIHRoaXMuX3VwZGF0 ZVJlc291cmNlV2l0aENhY2hlZFJlc291cmNlKHJlc291cmNlLCBjYWNoZWRSZXNvdXJjZSk7CiAg ICAgICAgIHJlc291cmNlLmNhY2hlZCA9IHRydWU7CiAgICAgICAgIHJlc291cmNlLnJlcXVlc3RN ZXRob2QgPSAiR0VUIjsKQEAgLTI3Miw4ICsyNzQsOSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rp c3BhdGNoZXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIG9yaWdpbmFsUmVzb3Vy Y2UgPSB0aGlzLl9pbmZsaWdodFJlc291cmNlc0J5SWRbaWRlbnRpZmllcl07CiAgICAgICAgIHZh ciBwcmV2aW91c1JlZGlyZWN0cyA9IG9yaWdpbmFsUmVzb3VyY2UucmVkaXJlY3RzIHx8IFtdOwot ICAgICAgICBkZWxldGUgb3JpZ2luYWxSZXNvdXJjZS5pZGVudGlmaWVyOworICAgICAgICBvcmln aW5hbFJlc291cmNlLmlkZW50aWZpZXIgPSAicmVkaXJlY3RlZDoiICsgaWRlbnRpZmllciArICIu IiArIHByZXZpb3VzUmVkaXJlY3RzLmxlbmd0aDsKICAgICAgICAgZGVsZXRlIG9yaWdpbmFsUmVz b3VyY2UucmVkaXJlY3RzOworICAgICAgICBvcmlnaW5hbFJlc291cmNlLmhhc05ldHdvcmtEYXRh ID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX2ZpbmlzaFJlc291cmNlKG9yaWdpbmFsUmVzb3VyY2Us IHRpbWUpOwogICAgICAgICB2YXIgbmV3UmVzb3VyY2UgPSB0aGlzLl9jcmVhdGVSZXNvdXJjZShp ZGVudGlmaWVyLCBvcmlnaW5hbFJlc291cmNlLmZyYW1lSWQsIG9yaWdpbmFsUmVzb3VyY2UubG9h ZGVySWQsCiAgICAgICAgICAgICAgcmVkaXJlY3RVUkwsIG9yaWdpbmFsUmVzb3VyY2UuZG9jdW1l bnRVUkwsIG9yaWdpbmFsUmVzb3VyY2Uuc3RhY2tUcmFjZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IGI0YTViNmFkNTZj YjM4YWUzZjRiNGZmNTk3ODFkZTUxOTZhYTgyZmEuLmEwYTJmYWFhOTU5MWU2YTBkZWNiY2Q0NmVk MjM0OGEzNDJjYzQ1MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvTmV0d29ya1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvTmV0d29ya1BhbmVsLmpzCkBAIC03NTEsOCArNzUxLDE3IEBAIFdlYkluc3BlY3Rvci5O ZXR3b3JrUGFuZWwucHJvdG90eXBlID0gewogICAgIF9hcHBlbmRSZXNvdXJjZTogZnVuY3Rpb24o cmVzb3VyY2UpCiAgICAgewogICAgICAgICB0aGlzLl9yZXNvdXJjZXMucHVzaChyZXNvdXJjZSk7 Ci0gICAgICAgIGlmIChyZXNvdXJjZS5pZGVudGlmaWVyKQotICAgICAgICAgICAgdGhpcy5fcmVz b3VyY2VzQnlJZFtyZXNvdXJjZS5pZGVudGlmaWVyXSA9IHJlc291cmNlOworICAgICAgICAKKyAg ICAgICAgLy8gSW4gY2FzZSBvZiByZWRpcmVjdCByZXNvdXJjZSBpZGVudGlmaWVyIGlzIHJlYXNz aWduZWQgdG8gYSByZWRpcmVjdGVkIAorICAgICAgICAvLyByZXNvdXJjZSBhbmQgd2UgbmVlZCB0 byB1cGRhdGUgX3Jlc291cmNlc0J5SWQgYW5zIHNlYXJjaCByZXN1bHRzLiAKKyAgICAgICAgaWYg KHRoaXMuX3Jlc291cmNlc0J5SWRbcmVzb3VyY2UuaWRlbnRpZmllcl0pIHsKKyAgICAgICAgICAg IHZhciBvbGRSZXNvdXJjZSA9IHJlc291cmNlLnJlZGlyZWN0c1tyZXNvdXJjZS5yZWRpcmVjdHMu bGVuZ3RoIC0gMV07CisgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZXNCeUlkW29sZFJlc291cmNl LmlkZW50aWZpZXJdID0gb2xkUmVzb3VyY2U7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIHRo aXMuX3VwZGF0ZVNlYXJjaE1hdGNoZWRMaXN0QWZ0ZXJSZXNvdXJjZUlkZW50aWZpZXJDaGFuZ2Vk KHJlc291cmNlLmlkZW50aWZpZXIsIG9sZFJlc291cmNlLmlkZW50aWZpZXIpOworICAgICAgICB9 CisgICAgICAgIHRoaXMuX3Jlc291cmNlc0J5SWRbcmVzb3VyY2UuaWRlbnRpZmllcl0gPSByZXNv dXJjZTsKKyAgICAgICAgCiAgICAgICAgIHRoaXMuX3Jlc291cmNlc0J5VVJMW3Jlc291cmNlLnVy bF0gPSByZXNvdXJjZTsKIAogICAgICAgICAvLyBQdWxsIGFsbCB0aGUgcmVkaXJlY3RzIG9mIHRo ZSBtYWluIHJlc291cmNlIHVwb24gY29tbWl0IGxvYWQuCkBAIC03OTMsNyArODAyLDcgQEAgV2Vi SW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHRoaXMuX3Jlc291cmNlcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAg ICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX3Jlc291cmNlc1tpXTsKICAgICAgICAgICAgICAgICBp ZiAocmVzb3VyY2UubG9hZGVySWQgIT09IGxvYWRlcklkKQotICAgICAgICAgICAgICAgICAgICBy ZXNvdXJjZS5pZGVudGlmaWVyID0gbnVsbDsKKyAgICAgICAgICAgICAgICAgICAgcmVzb3VyY2Uu aGFzTmV0d29ya0RhdGEgPSBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgfQpAQCAtMTEzNyw2ICsxMTQ2LDE3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3Jr UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9oaWdobGlnaHROdGhNYXRjaGVkUmVz b3VyY2UoLTEsIGZhbHNlKTsKICAgICB9LAogCisgICAgX3VwZGF0ZVNlYXJjaE1hdGNoZWRMaXN0 QWZ0ZXJSZXNvdXJjZUlkZW50aWZpZXJDaGFuZ2VkOiBmdW5jdGlvbihvbGRJZGVudGlmaWVyLCBu ZXdJZGVudGlmaWVyKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX21hdGNoZWRSZXNvdXJjZXNN YXBbb2xkSWRlbnRpZmllcl0pIHsKKyAgICAgICAgICAgIHZhciByZXNvdXJjZUluZGV4ID0gdGhp cy5fbWF0Y2hlZFJlc291cmNlc01hcFtvbGRJZGVudGlmaWVyXTsKKyAgICAgICAgICAgIGRlbGV0 ZSB0aGlzLl9tYXRjaGVkUmVzb3VyY2VzTWFwW29sZElkZW50aWZpZXJdOworICAgICAgICAgICAg CisgICAgICAgICAgICB0aGlzLl9tYXRjaGVkUmVzb3VyY2VzTWFwW25ld0lkZW50aWZpZXJdID0g cmVzb3VyY2VJbmRleDsKKyAgICAgICAgICAgIHRoaXMuX21hdGNoZWRSZXNvdXJjZXNbcmVzb3Vy Y2VJbmRleF0gPSBuZXdJZGVudGlmaWVyOworICAgICAgICB9CisgICAgfSwKKwogICAgIF91cGRh dGVIaWdobGlnaHRJZk1hdGNoZWQ6IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHsKICAgICAgICAg dmFyIG1hdGNoZWRSZXNvdXJjZUluZGV4ID0gdGhpcy5fbWF0Y2hSZXNvdXJjZShyZXNvdXJjZSk7 Cg== 100477 2011-07-12 06:30:08 -0700 2011-07-13 07:02:40 -0700 Patch with fixes2 bug-64287-20110712173006.patch text/plain 6528 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTA3MzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3NWRhZjdkZjgzODJjNzA2 ZTk0YjEyMjdiM2Q2OTFkMTM0ZjFiYzUwLi5hZjMyODgzZDc1MGQ3YTNkYThkZmQ5ZGJjMjIwYmY1 YjE0ZjlhZGIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMTIgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogTmV0d29yayBwYW5lbCBzZWFyY2ggbmVlZHMgZWFjaCByZXNvdXJjZSB0byBoYXZlIHVuaXF1 ZSBpZGVudGlmaWVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQyODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlcik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLnJlcXVlc3RXaWxsQmVTZW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUucmVzb3VyY2VM b2FkZWRGcm9tTWVtb3J5Q2FjaGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNw YXRjaGVyLnByb3RvdHlwZS5fYXBwZW5kUmVkaXJlY3QpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQ YW5lbC5wcm90b3R5cGUuX2FwcGVuZFJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrUGFuZWwucHJvdG90eXBlLl9mcmFtZU5hdmlnYXRlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5fdXBkYXRlU2VhcmNoTWF0Y2hlZExpc3RBZnRl clJlc291cmNlSWRlbnRpZmllckNoYW5nZWQpOgorCiAyMDExLTA3LTExICBNdXN0YWZpenVyIFJh aGFtYW4gIDxtdXN0YWYuaGVyZUBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmFt ZXMgUm9iaW5zb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL05ldHdvcmtNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9OZXR3b3JrTWFuYWdlci5qcwppbmRleCAxZjM1NjZmOTdiYjY5NTdhNGZjZDdmMWRmOGFkZTM5 YzA4OWMzY2ZjLi5kNWUxMTkwY2ZkMWY5OTM4YjYwNDc0ZTJlMDA5YjI2MGIyMWFhOTYzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2Vy LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFn ZXIuanMKQEAgLTUzLDcgKzUzLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnByb3Rv dHlwZSA9IHsKICAgICAgICAgfQogICAgICAgICAvLyBGSVhNRTogaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTYxMzYzIFdlIHNob3VsZCBzZXBhcmF0ZSBOZXR3b3JrUmVz b3VyY2UgKE5ldHdvcmtQYW5lbCByZXNvdXJjZSkgCiAgICAgICAgIC8vIGZyb20gUmVzb3VyY2VS ZXZpc2lvbiAoUmVzb3VyY2VzUGFuZWwvU2NyaXB0c1BhbmVsIHJlc291cmNlKSBhbmQgcmVxdWVz dCBjb250ZW50IGFjY29yZGluZ2x5LgotICAgICAgICBpZiAocmVzb3VyY2UuaWRlbnRpZmllcikK KyAgICAgICAgaWYgKHJlc291cmNlLmhhc05ldHdvcmtEYXRhKQogICAgICAgICAgICAgTmV0d29y a0FnZW50LmdldFJlc291cmNlQ29udGVudChyZXNvdXJjZS5pZGVudGlmaWVyLCBjYWxsYmFja1dy YXBwZXIpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBQYWdlQWdlbnQuZ2V0UmVzb3VyY2VD b250ZW50KHJlc291cmNlLmZyYW1lSWQsIHJlc291cmNlLnVybCwgY2FsbGJhY2tXcmFwcGVyKTsK QEAgLTcyLDYgKzcyLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyID0gZnVuY3Rp b24obWFuYWdlcikKICAgICB0aGlzLl9tYW5hZ2VyID0gbWFuYWdlcjsKICAgICB0aGlzLl9pbmZs aWdodFJlc291cmNlc0J5SWQgPSB7fTsKICAgICB0aGlzLl9pbmZsaWdodFJlc291cmNlc0J5VVJM ID0ge307CisgICAgdGhpcy5fbGFzdElkZW50aWZpZXJGb3JDYWNoZWRSZXNvdXJjZSA9IDA7CiAg ICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIoIk5ldHdvcmsiLCB0 aGlzKTsKIH0KIApAQCAtMTMzLDYgKzEzNCw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0 Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXNvdXJjZSA9IHRoaXMuX2FwcGVuZFJl ZGlyZWN0KGlkZW50aWZpZXIsIHRpbWUsIHJlcXVlc3QudXJsKTsKICAgICAgICAgfSBlbHNlCiAg ICAgICAgICAgICByZXNvdXJjZSA9IHRoaXMuX2NyZWF0ZVJlc291cmNlKGlkZW50aWZpZXIsIGZy YW1lSWQsIGxvYWRlcklkLCByZXF1ZXN0LnVybCwgZG9jdW1lbnRVUkwsIHN0YWNrVHJhY2UpOwor ICAgICAgICByZXNvdXJjZS5oYXNOZXR3b3JrRGF0YSA9IHRydWU7CiAgICAgICAgIHRoaXMuX3Vw ZGF0ZVJlc291cmNlV2l0aFJlcXVlc3QocmVzb3VyY2UsIHJlcXVlc3QpOwogICAgICAgICByZXNv dXJjZS5zdGFydFRpbWUgPSB0aW1lOwogCkBAIC0yMDQsNyArMjA2LDcgQEAgV2ViSW5zcGVjdG9y Lk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKIAogICAgIHJlc291cmNlTG9hZGVkRnJv bU1lbW9yeUNhY2hlOiBmdW5jdGlvbihmcmFtZUlkLCBsb2FkZXJJZCwgZG9jdW1lbnRVUkwsIHRp bWUsIGNhY2hlZFJlc291cmNlKQogICAgIHsKLSAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5f Y3JlYXRlUmVzb3VyY2UobnVsbCwgZnJhbWVJZCwgbG9hZGVySWQsIGNhY2hlZFJlc291cmNlLnVy bCwgZG9jdW1lbnRVUkwpOworICAgICAgICB2YXIgcmVzb3VyY2UgPSB0aGlzLl9jcmVhdGVSZXNv dXJjZSgiY2FjaGVkOiIgKyArK3RoaXMuX2xhc3RJZGVudGlmaWVyRm9yQ2FjaGVkUmVzb3VyY2Us IGZyYW1lSWQsIGxvYWRlcklkLCBjYWNoZWRSZXNvdXJjZS51cmwsIGRvY3VtZW50VVJMKTsKICAg ICAgICAgdGhpcy5fdXBkYXRlUmVzb3VyY2VXaXRoQ2FjaGVkUmVzb3VyY2UocmVzb3VyY2UsIGNh Y2hlZFJlc291cmNlKTsKICAgICAgICAgcmVzb3VyY2UuY2FjaGVkID0gdHJ1ZTsKICAgICAgICAg cmVzb3VyY2UucmVxdWVzdE1ldGhvZCA9ICJHRVQiOwpAQCAtMjcyLDggKzI3NCw5IEBAIFdlYklu c3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB2 YXIgb3JpZ2luYWxSZXNvdXJjZSA9IHRoaXMuX2luZmxpZ2h0UmVzb3VyY2VzQnlJZFtpZGVudGlm aWVyXTsKICAgICAgICAgdmFyIHByZXZpb3VzUmVkaXJlY3RzID0gb3JpZ2luYWxSZXNvdXJjZS5y ZWRpcmVjdHMgfHwgW107Ci0gICAgICAgIGRlbGV0ZSBvcmlnaW5hbFJlc291cmNlLmlkZW50aWZp ZXI7CisgICAgICAgIG9yaWdpbmFsUmVzb3VyY2UuaWRlbnRpZmllciA9ICJyZWRpcmVjdGVkOiIg KyBpZGVudGlmaWVyICsgIi4iICsgcHJldmlvdXNSZWRpcmVjdHMubGVuZ3RoOwogICAgICAgICBk ZWxldGUgb3JpZ2luYWxSZXNvdXJjZS5yZWRpcmVjdHM7CisgICAgICAgIG9yaWdpbmFsUmVzb3Vy Y2UuaGFzTmV0d29ya0RhdGEgPSBmYWxzZTsKICAgICAgICAgdGhpcy5fZmluaXNoUmVzb3VyY2Uo b3JpZ2luYWxSZXNvdXJjZSwgdGltZSk7CiAgICAgICAgIHZhciBuZXdSZXNvdXJjZSA9IHRoaXMu X2NyZWF0ZVJlc291cmNlKGlkZW50aWZpZXIsIG9yaWdpbmFsUmVzb3VyY2UuZnJhbWVJZCwgb3Jp Z2luYWxSZXNvdXJjZS5sb2FkZXJJZCwKICAgICAgICAgICAgICByZWRpcmVjdFVSTCwgb3JpZ2lu YWxSZXNvdXJjZS5kb2N1bWVudFVSTCwgb3JpZ2luYWxSZXNvdXJjZS5zdGFja1RyYWNlKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVs LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMK aW5kZXggYjRhNWI2YWQ1NmNiMzhhZTNmNGI0ZmY1OTc4MWRlNTE5NmFhODJmYS4uNmRmOTE3ZWQ5 MTdmOTZkYWVmOGQwYzZmZDY0NzJkODE4NzIzZWI1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKQEAgLTc1MSw4ICs3NTEsMTcg QEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgX2FwcGVuZFJl c291cmNlOiBmdW5jdGlvbihyZXNvdXJjZSkKICAgICB7CiAgICAgICAgIHRoaXMuX3Jlc291cmNl cy5wdXNoKHJlc291cmNlKTsKLSAgICAgICAgaWYgKHJlc291cmNlLmlkZW50aWZpZXIpCi0gICAg ICAgICAgICB0aGlzLl9yZXNvdXJjZXNCeUlkW3Jlc291cmNlLmlkZW50aWZpZXJdID0gcmVzb3Vy Y2U7CisgICAgICAgIAorICAgICAgICAvLyBJbiBjYXNlIG9mIHJlZGlyZWN0IHJlc291cmNlIGlk ZW50aWZpZXIgaXMgcmVhc3NpZ25lZCB0byBhIHJlZGlyZWN0ZWQgCisgICAgICAgIC8vIHJlc291 cmNlIGFuZCB3ZSBuZWVkIHRvIHVwZGF0ZSBfcmVzb3VyY2VzQnlJZCBhbnMgc2VhcmNoIHJlc3Vs dHMuIAorICAgICAgICBpZiAodGhpcy5fcmVzb3VyY2VzQnlJZFtyZXNvdXJjZS5pZGVudGlmaWVy XSkgeworICAgICAgICAgICAgdmFyIG9sZFJlc291cmNlID0gcmVzb3VyY2UucmVkaXJlY3RzW3Jl c291cmNlLnJlZGlyZWN0cy5sZW5ndGggLSAxXTsKKyAgICAgICAgICAgIHRoaXMuX3Jlc291cmNl c0J5SWRbb2xkUmVzb3VyY2UuaWRlbnRpZmllcl0gPSBvbGRSZXNvdXJjZTsKKyAgICAgICAgICAg IAorICAgICAgICAgICAgdGhpcy5fdXBkYXRlU2VhcmNoTWF0Y2hlZExpc3RBZnRlclJlc291cmNl SWRlbnRpZmllckNoYW5nZWQocmVzb3VyY2UuaWRlbnRpZmllciwgb2xkUmVzb3VyY2UuaWRlbnRp Zmllcik7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5fcmVzb3VyY2VzQnlJZFtyZXNvdXJjZS5p ZGVudGlmaWVyXSA9IHJlc291cmNlOworICAgICAgICAKICAgICAgICAgdGhpcy5fcmVzb3VyY2Vz QnlVUkxbcmVzb3VyY2UudXJsXSA9IHJlc291cmNlOwogCiAgICAgICAgIC8vIFB1bGwgYWxsIHRo ZSByZWRpcmVjdHMgb2YgdGhlIG1haW4gcmVzb3VyY2UgdXBvbiBjb21taXQgbG9hZC4KQEAgLTc5 Myw3ICs4MDIsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fcmVzb3VyY2VzLmxlbmd0aDsgKytp KSB7CiAgICAgICAgICAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5fcmVzb3VyY2VzW2ldOwog ICAgICAgICAgICAgICAgIGlmIChyZXNvdXJjZS5sb2FkZXJJZCAhPT0gbG9hZGVySWQpCi0gICAg ICAgICAgICAgICAgICAgIHJlc291cmNlLmlkZW50aWZpZXIgPSBudWxsOworICAgICAgICAgICAg ICAgICAgICByZXNvdXJjZS5oYXNOZXR3b3JrRGF0YSA9IGZhbHNlOwogICAgICAgICAgICAgfQog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC0xMTM3LDYgKzExNDYsMTYgQEAgV2Vi SW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2hpZ2hs aWdodE50aE1hdGNoZWRSZXNvdXJjZSgtMSwgZmFsc2UpOwogICAgIH0sCiAKKyAgICBfdXBkYXRl U2VhcmNoTWF0Y2hlZExpc3RBZnRlclJlc291cmNlSWRlbnRpZmllckNoYW5nZWQ6IGZ1bmN0aW9u KG9sZElkZW50aWZpZXIsIG5ld0lkZW50aWZpZXIpCisgICAgeworICAgICAgICB2YXIgcmVzb3Vy Y2VJbmRleCA9IHRoaXMuX21hdGNoZWRSZXNvdXJjZXNNYXBbb2xkSWRlbnRpZmllcl07CisgICAg ICAgIGlmIChyZXNvdXJjZUluZGV4KSB7CisgICAgICAgICAgICBkZWxldGUgdGhpcy5fbWF0Y2hl ZFJlc291cmNlc01hcFtvbGRJZGVudGlmaWVyXTsKKyAgICAgICAgICAgIHRoaXMuX21hdGNoZWRS ZXNvdXJjZXNNYXBbbmV3SWRlbnRpZmllcl0gPSByZXNvdXJjZUluZGV4OworICAgICAgICAgICAg dGhpcy5fbWF0Y2hlZFJlc291cmNlc1tyZXNvdXJjZUluZGV4XSA9IG5ld0lkZW50aWZpZXI7Cisg ICAgICAgIH0KKyAgICB9LAorCiAgICAgX3VwZGF0ZUhpZ2hsaWdodElmTWF0Y2hlZDogZnVuY3Rp b24ocmVzb3VyY2UpCiAgICAgewogICAgICAgICB2YXIgbWF0Y2hlZFJlc291cmNlSW5kZXggPSB0 aGlzLl9tYXRjaFJlc291cmNlKHJlc291cmNlKTsK