74221 2011-12-09 14:57:55 -0800 Web Inspector: consider disabling network tracking while running the CPU profile 2012-08-07 02:33:31 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman loislo apavlov bweinstein dglazkov joepeck keishi loislo ojan pfeldman pmuellr rik timothy vsevik webkit.review.bot yurys oldest_to_newest 518556 0 pfeldman 2011-12-09 14:57:55 -0800 User report =======8<===== I've noticed that in some cases my profiles are thrown way off by really really slow calls to xhr.send. Profiling inside maps.google.com the xhr.send calls take up to 40ms! I've learned that I can work around this by starting a profile at the console (console.profile()), closing dev tools, doing my test, then reopening dev tools and doing console.profileEnd(). It works but it's a big pain. =======>8===== 518583 1 pfeldman 2011-12-09 15:30:41 -0800 Same applies to the console logging (console.log(), etc.) 518599 2 ojan 2011-12-09 15:47:30 -0800 Does the same apply to updating the Elements panel as well? 518610 3 pfeldman 2011-12-09 15:54:15 -0800 (In reply to comment #2) > Does the same apply to updating the Elements panel as well? It probably does. We would also need to re-fetch the DOM tree and cached messages upon the profile completion. 519199 4 118788 loislo 2011-12-12 07:57:23 -0800 Created attachment 118788 Patch 519223 5 118788 pfeldman 2011-12-12 08:41:04 -0800 Comment on attachment 118788 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=118788&action=review > Source/WebCore/inspector/front-end/ProfileView.js:594 > + NetworkAgent.enable(); You should adjust the code so that after enabling the agent ResourceTreeModel was going through _frontendReused. 520058 6 119010 loislo 2011-12-13 06:44:32 -0800 Created attachment 119010 Patch 520072 7 119010 webkit.review.bot 2011-12-13 07:20:14 -0800 Comment on attachment 119010 Patch Attachment 119010 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10847375 New failing tests: http/tests/inspector-enabled/dom-storage-open.html http/tests/inspector-enabled/database-open.html 520329 8 119010 pfeldman 2011-12-13 13:19:04 -0800 Comment on attachment 119010 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119010&action=review > Source/WebCore/ChangeLog:6 > + User report: ChangeLog should not include all the bug report details. It should rather be a summary of the changes performed. > Source/WebCore/inspector/front-end/NetworkManager.js:42 > + this._resourceTrackingRequestSent = false; this._resourceTracking should be sufficient. 520658 9 119151 loislo 2011-12-13 21:02:15 -0800 Created attachment 119151 Patch 520675 10 119153 loislo 2011-12-13 21:59:09 -0800 Created attachment 119153 Patch 520781 11 119153 pfeldman 2011-12-14 01:37:41 -0800 Comment on attachment 119153 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119153&action=review > Source/WebCore/ChangeLog:7 > + As the result the CPU profiler's stats data are far away from the reality. Not that far, just skewed. > Source/WebCore/inspector/front-end/NetworkManager.js:86 > + return; Can this happen? > Source/WebCore/inspector/front-end/NetworkManager.js:102 > + return; ditto > Source/WebCore/inspector/front-end/ProfileView.js:591 > ProfilerAgent.start(); You should proceed with the profiling from within the callback. > Source/WebCore/inspector/front-end/ProfileView.js:594 > + WebInspector.networkManager.enableResourceTracking(); ditto > Source/WebCore/inspector/front-end/ResourceTreeModel.js:50 > + networkManager.enableResourceTracking(); You already enable resource tracking from the network manager constructor. > Source/WebCore/inspector/front-end/ResourceTreeModel.js:51 > + this._resourceTrackingWasDisabled = false; There is probably no need to mirror the network manager state here. 520843 12 119153 loislo 2011-12-14 04:23:00 -0800 Comment on attachment 119153 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119153&action=review >> Source/WebCore/inspector/front-end/NetworkManager.js:86 >> + return; > > Can this happen? It is public method and due to asynchronous nature of our protocol there is a chance that somebody call enableResourceTracking twice. I had a guard for that in previous patch but you against it. This version will send two enable command to the backend but ResourceTrackingEnabled event will be fired only for the first one. Without such the guard ResourceTreeModel or another consumer for these events will re-fetch tree twice. >> Source/WebCore/inspector/front-end/ProfileView.js:591 >> ProfilerAgent.start(); > > You should proceed with the profiling from within the callback. It is not really necessary to call it from a callback. protocol guarantee us that our commands will be executed sequentially. 520851 13 119153 loislo 2011-12-14 04:42:40 -0800 Comment on attachment 119153 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119153&action=review >> Source/WebCore/inspector/front-end/ResourceTreeModel.js:51 >> + this._resourceTrackingWasDisabled = false; > > There is probably no need to mirror the network manager state here. otherwise we will fetch the resource tree twice at start-up. This increases start-up time and introduces test failures. 520948 14 119153 pfeldman 2011-12-14 08:39:35 -0800 Comment on attachment 119153 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119153&action=review >>> Source/WebCore/inspector/front-end/NetworkManager.js:86 >>> + return; >> >> Can this happen? > > It is public method and due to asynchronous nature of our protocol there is a chance that somebody call enableResourceTracking twice. > I had a guard for that in previous patch but you against it. > This version will send two enable command to the backend but ResourceTrackingEnabled event will be fired only for the first one. > Without such the guard ResourceTreeModel or another consumer for these events will re-fetch tree twice. I don't think we should expect the call site to be so much wrong. >>> Source/WebCore/inspector/front-end/ProfileView.js:591 >>> ProfilerAgent.start(); >> >> You should proceed with the profiling from within the callback. > > It is not really necessary to call it from a callback. protocol guarantee us that our commands will be executed sequentially. Right, but that's the only way to guarantee that by the time you issue ProfilerAgent.start(), this._resourceTracking in the network agent is "false". >>> Source/WebCore/inspector/front-end/ResourceTreeModel.js:51 >>> + this._resourceTrackingWasDisabled = false; >> >> There is probably no need to mirror the network manager state here. > > otherwise we will fetch the resource tree twice at start-up. > This increases start-up time and introduces test failures. Well, you could do NetworkAgent.enable() in the NetworkManager constructor to mitigate this. I.e. make "enabled" state default and then track changes from this enabled state. 520979 15 119231 loislo 2011-12-14 09:12:07 -0800 Created attachment 119231 Patch 520988 16 119231 pfeldman 2011-12-14 09:21:47 -0800 Comment on attachment 119231 Patch Please remove the guards from enable and disable and it is good to go. 520991 17 pfeldman 2011-12-14 09:23:55 -0800 Please remove the guards from enable and disable and it is good to go. 521134 18 loislo 2011-12-14 11:34:51 -0800 Committed r102803 521346 19 pfeldman 2011-12-14 15:18:57 -0800 Please close the bugs upon landing patches manually. Also, it sounds like the state flag in the NetworkManager is no longer used. Please remove it as a follow up to this change. 688984 20 vsevik 2012-08-07 02:33:31 -0700 Chromium issue: http://code.google.com/p/chromium/issues/detail?id=107138 118788 2011-12-12 07:57:23 -0800 2011-12-13 06:44:25 -0800 Patch bug-74221-20111212195721.patch text/plain 1918 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjc3NGM2OTM5ZmI5ZmU2 NmE5NGFkM2YwYjVlYzRkYjk3MWNjZDVkZC4uY2M1MzJhMzQyYzRhNmY2NzEwZjJhMzhlYTNhNmJh OWYyODIyMTdkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTEyLTEyICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBjb25zaWRlciBkaXNhYmxpbmcgbmV0d29yayB0cmFja2luZyB3aGlsZSBydW5uaW5nIHRo ZSBDUFUgcHJvZmlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc0MjIxCisKKyAgICAgICAgVXNlciByZXBvcnQ6CisgICAgICAgIEkndmUgbm90aWNl ZCB0aGF0IGluIHNvbWUgY2FzZXMgbXkgcHJvZmlsZXMgYXJlIHRocm93biB3YXkgb2ZmIGJ5IHJl YWxseSByZWFsbHkgc2xvdyBjYWxscyB0byB4aHIuc2VuZC4KKyAgICAgICAgUHJvZmlsaW5nIGlu c2lkZSBtYXBzLmdvb2dsZS5jb20gdGhlIHhoci5zZW5kIGNhbGxzIHRha2UgdXAgdG8gNDBtcyEK KyAgICAgICAgSSd2ZSBsZWFybmVkIHRoYXQgSSBjYW4gd29yayBhcm91bmQgdGhpcyBieSBzdGFy dGluZyBhIHByb2ZpbGUgYXQgdGhlIGNvbnNvbGUgKGNvbnNvbGUucHJvZmlsZSgpKSwKKyAgICAg ICAgY2xvc2luZyBkZXYgdG9vbHMsIGRvaW5nIG15IHRlc3QsIHRoZW4gcmVvcGVuaW5nIGRldiB0 b29scyBhbmQgZG9pbmcgY29uc29sZS5wcm9maWxlRW5kKCkuIEl0IHdvcmtzIGJ1dCBpdCdzIGEg YmlnIHBhaW4uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNQVVByb2ZpbGVUeXBlLnByb3RvdHlwZS5idXR0b25DbGlja2VkKToKKwogMjAxMS0x Mi0xMiAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IEltcGxlbWVudCBhIGNhY2hlIGZvciBDU1NTdHlsZVJ1bGU6OnNlbGVjdG9yVGV4dCgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3Lmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcwppbmRl eCA3NGNkM2IyZTY2YWNkMzg5NjIyMjYyNWE4MTU5ODdhOTE4YjJiMWE1Li5jZmQ5N2FmYThjNTdh YWUxMDY2NWE2MGQyMjZlZGMyYjllM2FmNTUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMKQEAgLTU4NiwxMCArNTg2LDEzIEBAIFdl Ykluc3BlY3Rvci5DUFVQcm9maWxlVHlwZS5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB0 aGlzLl9yZWNvcmRpbmcgPSAhdGhpcy5fcmVjb3JkaW5nOwogCi0gICAgICAgIGlmICh0aGlzLl9y ZWNvcmRpbmcpCisgICAgICAgIGlmICh0aGlzLl9yZWNvcmRpbmcpIHsKKyAgICAgICAgICAgIE5l dHdvcmtBZ2VudC5kaXNhYmxlKCk7CiAgICAgICAgICAgICBQcm9maWxlckFnZW50LnN0YXJ0KCk7 Ci0gICAgICAgIGVsc2UKKyAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIFByb2ZpbGVyQWdl bnQuc3RvcCgpOworICAgICAgICAgICAgTmV0d29ya0FnZW50LmVuYWJsZSgpOworICAgICAgICB9 CiAgICAgfSwKIAogICAgIGdldCB3ZWxjb21lTWVzc2FnZSgpCg== 119010 2011-12-13 06:44:32 -0800 2011-12-13 21:02:07 -0800 Patch bug-74221-20111213184430.patch text/plain 6614 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjRhM2I2NjE0ZGQ4NGU3 YzA4NTRiZGQzMDg3ZjllMjUyNDA2MjBiNS4uNTE2ZDg5NWJlNTBkZWE0NDA0YjdmNTdjMTFlYzE4 OWNhMDdlM2M1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDExLTEyLTEzICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBjb25zaWRlciBkaXNhYmxpbmcgbmV0d29yayB0cmFja2luZyB3aGlsZSBydW5uaW5nIHRo ZSBDUFUgcHJvZmlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc0MjIxCisKKyAgICAgICAgVXNlciByZXBvcnQ6CisgICAgICAgIEkndmUgbm90aWNl ZCB0aGF0IGluIHNvbWUgY2FzZXMgbXkgcHJvZmlsZXMgYXJlIHRocm93biB3YXkgb2ZmIGJ5IHJl YWxseSByZWFsbHkgc2xvdyBjYWxscyB0byB4aHIuc2VuZC4KKyAgICAgICAgUHJvZmlsaW5nIGlu c2lkZSBtYXBzLmdvb2dsZS5jb20gdGhlIHhoci5zZW5kIGNhbGxzIHRha2UgdXAgdG8gNDBtcyEK KyAgICAgICAgSSd2ZSBsZWFybmVkIHRoYXQgSSBjYW4gd29yayBhcm91bmQgdGhpcyBieSBzdGFy dGluZyBhIHByb2ZpbGUgYXQgdGhlIGNvbnNvbGUgKGNvbnNvbGUucHJvZmlsZSgpKSwKKyAgICAg ICAgY2xvc2luZyBkZXYgdG9vbHMsIGRvaW5nIG15IHRlc3QsIHRoZW4gcmVvcGVuaW5nIGRldiB0 b29scyBhbmQgZG9pbmcgY29uc29sZS5wcm9maWxlRW5kKCkuIEl0IHdvcmtzIGJ1dCBpdCdzIGEg YmlnIHBhaW4uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnByb3RvdHlwZS5yZXNvdXJjZVRyYWNraW5nKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUuZW5hYmxlUmVzb3Vy Y2VUcmFja2luZy5uZXR3b3JrQWdlbnRFbmFibGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrTWFuYWdlci5wcm90b3R5cGUuZW5hYmxlUmVzb3VyY2VUcmFja2luZyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBlLmRpc2FibGVSZXNvdXJjZVRy YWNraW5nLm5ldHdvcmtBZ2VudERpc2FibGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3 b3JrTWFuYWdlci5wcm90b3R5cGUuZGlzYWJsZVJlc291cmNlVHJhY2tpbmcpOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ1BVUHJvZmlsZVR5cGUucHJvdG90eXBlLmJ1dHRvbkNsaWNrZWQpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwpOgorCiAyMDExLTEyLTEzICBWc2V2b2xvZCBWbGFzb3Yg IDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFkZCBzY3Jp cHRzIG5hdmlnYXRvciBzaWRlYmFyIHRvIHNjcmlwdHMgcGFuZWwuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwppbmRleCBkNmNm NzA2ZDVhNGE3ZWQ1MTI0NTlkMGU3OTk2ZTRkMDJjZDQ5Y2RmLi5lYmZiNDMzNzcxMWYzZDgwNmFl MDUzN2Y2MzNiMWNmOTkyYTZkYTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKQEAgLTM4LDcgKzM4LDkgQEAgV2ViSW5z cGVjdG9yLk5ldHdvcmtNYW5hZ2VyID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX2Rpc3BhdGNoZXIg PSBuZXcgV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyKHRoaXMpOwogICAgIGlmIChXZWJJ bnNwZWN0b3Iuc2V0dGluZ3MuY2FjaGVEaXNhYmxlZC5nZXQoKSkKICAgICAgICAgTmV0d29ya0Fn ZW50LnNldENhY2hlRGlzYWJsZWQodHJ1ZSk7Ci0gICAgTmV0d29ya0FnZW50LmVuYWJsZSgpOwor ICAgIHRoaXMuX3Jlc291cmNlVHJhY2tpbmcgPSBmYWxzZTsKKyAgICB0aGlzLl9yZXNvdXJjZVRy YWNraW5nUmVxdWVzdFNlbnQgPSBmYWxzZTsKKyAgICB0aGlzLmVuYWJsZVJlc291cmNlVHJhY2tp bmcoKTsKIAogICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5jYWNoZURpc2FibGVkLmFkZENoYW5n ZUxpc3RlbmVyKHRoaXMuX2NhY2hlRGlzYWJsZWRTZXR0aW5nQ2hhbmdlZCwgdGhpcyk7CiAKQEAg LTQ4LDYgKzUwLDggQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyID0gZnVuY3Rpb24oKQog fQogCiBXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIuRXZlbnRUeXBlcyA9IHsKKyAgICBSZXNv dXJjZVRyYWNraW5nRW5hYmxlZDogIlJlc291cmNlVHJhY2tpbmdFbmFibGVkIiwKKyAgICBSZXNv dXJjZVRyYWNraW5nRGlzYWJsZWQ6ICJSZXNvdXJjZVRyYWNraW5nRGlzYWJsZWQiLAogICAgIFJl c291cmNlU3RhcnRlZDogIlJlc291cmNlU3RhcnRlZCIsCiAgICAgUmVzb3VyY2VVcGRhdGVkOiAi UmVzb3VyY2VVcGRhdGVkIiwKICAgICBSZXNvdXJjZUZpbmlzaGVkOiAiUmVzb3VyY2VGaW5pc2hl ZCIsCkBAIC03Miw2ICs3Niw0OSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90 eXBlID0gewogICAgICAgICAgICAgUGFnZUFnZW50LmdldFJlc291cmNlQ29udGVudChyZXNvdXJj ZS5mcmFtZUlkLCByZXNvdXJjZS51cmwsIGNhbGxiYWNrV3JhcHBlcik7CiAgICAgfSwKIAorICAg IHJlc291cmNlVHJhY2tpbmc6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlz Ll9yZXNvdXJjZVRyYWNraW5nIF4gdGhpcy5fcmVzb3VyY2VUcmFja2luZ1JlcXVlc3RTZW50Owor ICAgIH0sCisKKyAgICBlbmFibGVSZXNvdXJjZVRyYWNraW5nOiBmdW5jdGlvbigpCisgICAgewor ICAgICAgICBpZiAodGhpcy5fcmVzb3VyY2VUcmFja2luZykKKyAgICAgICAgICAgIHJldHVybjsK KworICAgICAgICBpZiAodGhpcy5fcmVzb3VyY2VUcmFja2luZ1JlcXVlc3RTZW50KQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIGZ1bmN0aW9uIG5ldHdvcmtBZ2VudEVuYWJsZWQoKQor ICAgICAgICB7CisgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZVRyYWNraW5nID0gdHJ1ZTsKKyAg ICAgICAgICAgIHRoaXMuX3Jlc291cmNlVHJhY2tpbmdSZXF1ZXN0U2VudCA9IGZhbHNlOworICAg ICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLk5ldHdv cmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VUcmFja2luZ0VuYWJsZWQpOworICAgICAgICB9 CisKKyAgICAgICAgTmV0d29ya0FnZW50LmVuYWJsZShuZXR3b3JrQWdlbnRFbmFibGVkLmJpbmQo dGhpcykpOworICAgICAgICB0aGlzLl9yZXNvdXJjZVRyYWNraW5nUmVxdWVzdFNlbnQgPSB0cnVl OworICAgIH0sCisKKyAgICBkaXNhYmxlUmVzb3VyY2VUcmFja2luZzogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgaWYgKCF0aGlzLl9yZXNvdXJjZVRyYWNraW5nKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIGlmICh0aGlzLl9yZXNvdXJjZVRyYWNraW5nUmVxdWVzdFNlbnQpCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgZnVuY3Rpb24gbmV0d29ya0FnZW50RGlzYWJs ZWQoKQorICAgICAgICB7CisgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZVRyYWNraW5nID0gZmFs c2U7CisgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZVRyYWNraW5nUmVxdWVzdFNlbnQgPSBmYWxz ZTsKKyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rv ci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLlJlc291cmNlVHJhY2tpbmdEaXNhYmxlZCk7Cisg ICAgICAgfQorCisgICAgICAgIE5ldHdvcmtBZ2VudC5kaXNhYmxlKG5ldHdvcmtBZ2VudERpc2Fi bGVkLmJpbmQodGhpcykpOworICAgICAgICB0aGlzLl9yZXNvdXJjZVRyYWNraW5nUmVxdWVzdFNl bnQgPSB0cnVlOworICAgIH0sCisKICAgICBpbmZsaWdodFJlc291cmNlRm9yVVJMOiBmdW5jdGlv bih1cmwpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZGlzcGF0Y2hlci5faW5mbGlnaHRS ZXNvdXJjZXNCeVVSTFt1cmxdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUHJvZmlsZVZpZXcuanMKaW5kZXggNzRjZDNiMmU2NmFjZDM4OTYyMjI2MjVhODE1OTg3 YTkxOGIyYjFhNS4uODU0N2E2ZGIxYTg1YjI3OGFiNDY2YjJkNTkzNWI1ZDE4NTYxYTQ1MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3Lmpz CkBAIC01ODYsMTAgKzU4NiwxMyBAQCBXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVR5cGUucHJvdG90 eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy5fcmVjb3JkaW5nID0gIXRoaXMuX3JlY29yZGlu ZzsKIAotICAgICAgICBpZiAodGhpcy5fcmVjb3JkaW5nKQorICAgICAgICBpZiAodGhpcy5fcmVj b3JkaW5nKSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IubmV0d29ya01hbmFnZXIuZGlzYWJs ZVJlc291cmNlVHJhY2tpbmcoKTsKICAgICAgICAgICAgIFByb2ZpbGVyQWdlbnQuc3RhcnQoKTsK LSAgICAgICAgZWxzZQorICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgUHJvZmlsZXJBZ2Vu dC5zdG9wKCk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IubmV0d29ya01hbmFnZXIuZW5hYmxl UmVzb3VyY2VUcmFja2luZygpOworICAgICAgICB9CiAgICAgfSwKIAogICAgIGdldCB3ZWxjb21l TWVzc2FnZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlVHJlZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZVRyZWVNb2RlbC5qcwppbmRleCBlZGM1ZmRlMGEzMTk5M2Y1NmFlZmNkZDQxYjk3 MDkzMTJmZGYxNDdiLi42Y2Q5NTUyMmJmOGRkNGIyNGFmMDg5NWM3ZmNkM2IxZmRiMjJhYjNlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJl ZU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2VUcmVlTW9kZWwuanMKQEAgLTM1LDYgKzM1LDcgQEAKICAqLwogV2ViSW5zcGVjdG9yLlJlc291 cmNlVHJlZU1vZGVsID0gZnVuY3Rpb24obmV0d29ya01hbmFnZXIpCiB7CisgICAgbmV0d29ya01h bmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIuRXZlbnRU eXBlcy5SZXNvdXJjZVRyYWNraW5nRW5hYmxlZCwgdGhpcy5fZmV0Y2hSZXNvdXJjZVRyZWUsIHRo aXMpOwogICAgIG5ldHdvcmtNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLk5l dHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VVcGRhdGVkLCB0aGlzLl9vblJlc291cmNl VXBkYXRlZCwgdGhpcyk7CiAgICAgbmV0d29ya01hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuTmV0d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXNvdXJjZUZpbmlzaGVkLCB0aGlz Ll9vblJlc291cmNlVXBkYXRlZCwgdGhpcyk7CiAgICAgbmV0d29ya01hbmFnZXIuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXNvdXJjZVVw ZGF0ZURyb3BwZWQsIHRoaXMuX29uUmVzb3VyY2VVcGRhdGVEcm9wcGVkLCB0aGlzKTsKQEAgLTQ1 LDcgKzQ2LDExIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbCA9IGZ1bmN0aW9uKG5l dHdvcmtNYW5hZ2VyKQogCiAgICAgUGFnZUFnZW50LmVuYWJsZSgpOwogCi0gICAgdGhpcy5fZmV0 Y2hSZXNvdXJjZVRyZWUoKTsKKyAgICBpZiAobmV0d29ya01hbmFnZXIucmVzb3VyY2VUcmFja2lu ZygpKQorICAgICAgICB0aGlzLl9mZXRjaFJlc291cmNlVHJlZSgpOworICAgIGVsc2UKKyAgICAg ICAgbmV0d29ya01hbmFnZXIuZW5hYmxlUmVzb3VyY2VUcmFja2luZygpOworCiAgICAgSW5zcGVj dG9yQmFja2VuZC5yZWdpc3RlclBhZ2VEaXNwYXRjaGVyKG5ldyBXZWJJbnNwZWN0b3IuUGFnZURp c3BhdGNoZXIodGhpcykpOwogCiAgICAgdGhpcy5fcGVuZGluZ0NvbnNvbGVNZXNzYWdlcyA9IHt9 Owo= 119151 2011-12-13 21:02:15 -0800 2011-12-13 21:59:01 -0800 Patch bug-74221-20111214090213.patch text/plain 7311 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY5OTYwNjFlZGNkMTli NDFkYjMzYjQ0YTdmN2M3NTY1MDQ0NWRlNi4uNDJmMmE1MGFhZGZkZWQ2YzgxYjFlMTExZTc4MjU1 YmMxNjllNjk2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDExLTEyLTEzICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBjb25zaWRlciBkaXNhYmxpbmcgbmV0d29yayB0cmFja2luZyB3aGlsZSBydW5uaW5nIHRo ZSBDUFUgcHJvZmlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc0MjIxCisKKyAgICAgICAgVXNlciByZXBvcnQ6CisgICAgICAgIEkndmUgbm90aWNl ZCB0aGF0IGluIHNvbWUgY2FzZXMgbXkgcHJvZmlsZXMgYXJlIHRocm93biB3YXkgb2ZmIGJ5IHJl YWxseSByZWFsbHkgc2xvdyBjYWxscyB0byB4aHIuc2VuZC4KKyAgICAgICAgUHJvZmlsaW5nIGlu c2lkZSBtYXBzLmdvb2dsZS5jb20gdGhlIHhoci5zZW5kIGNhbGxzIHRha2UgdXAgdG8gNDBtcyEK KyAgICAgICAgSSd2ZSBsZWFybmVkIHRoYXQgSSBjYW4gd29yayBhcm91bmQgdGhpcyBieSBzdGFy dGluZyBhIHByb2ZpbGUgYXQgdGhlIGNvbnNvbGUgKGNvbnNvbGUucHJvZmlsZSgpKSwKKyAgICAg ICAgY2xvc2luZyBkZXYgdG9vbHMsIGRvaW5nIG15IHRlc3QsIHRoZW4gcmVvcGVuaW5nIGRldiB0 b29scyBhbmQgZG9pbmcgY29uc29sZS5wcm9maWxlRW5kKCkuIEl0IHdvcmtzIGJ1dCBpdCdzIGEg YmlnIHBhaW4uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnByb3RvdHlwZS5yZXNvdXJjZVRyYWNraW5nKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUuZW5hYmxlUmVzb3Vy Y2VUcmFja2luZy5uZXR3b3JrQWdlbnRFbmFibGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrTWFuYWdlci5wcm90b3R5cGUuZW5hYmxlUmVzb3VyY2VUcmFja2luZyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBlLmRpc2FibGVSZXNvdXJjZVRy YWNraW5nLm5ldHdvcmtBZ2VudERpc2FibGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3 b3JrTWFuYWdlci5wcm90b3R5cGUuZGlzYWJsZVJlc291cmNlVHJhY2tpbmcpOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ1BVUHJvZmlsZVR5cGUucHJvdG90eXBlLmJ1dHRvbkNsaWNrZWQpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNl VHJlZU1vZGVsLnByb3RvdHlwZS5fb25SZXNvdXJjZVRyYWNraW5nRW5hYmxlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBlLl9vblJlc291cmNlVHJh Y2tpbmdEaXNhYmxlZCk6CisKIDIwMTEtMTItMTMgIEhhamltZSBNb3JyaXRhICA8bW9ycml0YUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBDaHJvbWl1bS1NYWMgYnVpbGQgZml4 IHRyaWFsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9O ZXR3b3JrTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya01hbmFnZXIuanMKaW5kZXggZDZjZjcwNmQ1YTRhN2VkNTEyNDU5ZDBlNzk5NmU0ZDAyY2Q0 OWNkZi4uZWJmYjQzMzc3MTFmM2Q4MDZhZTA1MzdmNjMzYjFjZjk5MmE2ZGEyMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpz CkBAIC0zOCw3ICszOCw5IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlciA9IGZ1bmN0aW9u KCkKICAgICB0aGlzLl9kaXNwYXRjaGVyID0gbmV3IFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0 Y2hlcih0aGlzKTsKICAgICBpZiAoV2ViSW5zcGVjdG9yLnNldHRpbmdzLmNhY2hlRGlzYWJsZWQu Z2V0KCkpCiAgICAgICAgIE5ldHdvcmtBZ2VudC5zZXRDYWNoZURpc2FibGVkKHRydWUpOwotICAg IE5ldHdvcmtBZ2VudC5lbmFibGUoKTsKKyAgICB0aGlzLl9yZXNvdXJjZVRyYWNraW5nID0gZmFs c2U7CisgICAgdGhpcy5fcmVzb3VyY2VUcmFja2luZ1JlcXVlc3RTZW50ID0gZmFsc2U7CisgICAg dGhpcy5lbmFibGVSZXNvdXJjZVRyYWNraW5nKCk7CiAKICAgICBXZWJJbnNwZWN0b3Iuc2V0dGlu Z3MuY2FjaGVEaXNhYmxlZC5hZGRDaGFuZ2VMaXN0ZW5lcih0aGlzLl9jYWNoZURpc2FibGVkU2V0 dGluZ0NoYW5nZWQsIHRoaXMpOwogCkBAIC00OCw2ICs1MCw4IEBAIFdlYkluc3BlY3Rvci5OZXR3 b3JrTWFuYWdlciA9IGZ1bmN0aW9uKCkKIH0KIAogV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2Vy LkV2ZW50VHlwZXMgPSB7CisgICAgUmVzb3VyY2VUcmFja2luZ0VuYWJsZWQ6ICJSZXNvdXJjZVRy YWNraW5nRW5hYmxlZCIsCisgICAgUmVzb3VyY2VUcmFja2luZ0Rpc2FibGVkOiAiUmVzb3VyY2VU cmFja2luZ0Rpc2FibGVkIiwKICAgICBSZXNvdXJjZVN0YXJ0ZWQ6ICJSZXNvdXJjZVN0YXJ0ZWQi LAogICAgIFJlc291cmNlVXBkYXRlZDogIlJlc291cmNlVXBkYXRlZCIsCiAgICAgUmVzb3VyY2VG aW5pc2hlZDogIlJlc291cmNlRmluaXNoZWQiLApAQCAtNzIsNiArNzYsNDkgQEAgV2ViSW5zcGVj dG9yLk5ldHdvcmtNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIFBhZ2VBZ2VudC5n ZXRSZXNvdXJjZUNvbnRlbnQocmVzb3VyY2UuZnJhbWVJZCwgcmVzb3VyY2UudXJsLCBjYWxsYmFj a1dyYXBwZXIpOwogICAgIH0sCiAKKyAgICByZXNvdXJjZVRyYWNraW5nOiBmdW5jdGlvbigpCisg ICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2VUcmFja2luZyBeIHRoaXMuX3Jlc291 cmNlVHJhY2tpbmdSZXF1ZXN0U2VudDsKKyAgICB9LAorCisgICAgZW5hYmxlUmVzb3VyY2VUcmFj a2luZzogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX3Jlc291cmNlVHJhY2tp bmcpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKHRoaXMuX3Jlc291cmNlVHJh Y2tpbmdSZXF1ZXN0U2VudCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBmdW5jdGlv biBuZXR3b3JrQWdlbnRFbmFibGVkKCkKKyAgICAgICAgeworICAgICAgICAgICAgdGhpcy5fcmVz b3VyY2VUcmFja2luZyA9IHRydWU7CisgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZVRyYWNraW5n UmVxdWVzdFNlbnQgPSBmYWxzZTsKKyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLlJlc291cmNlVHJh Y2tpbmdFbmFibGVkKTsKKyAgICAgICAgfQorCisgICAgICAgIE5ldHdvcmtBZ2VudC5lbmFibGUo bmV0d29ya0FnZW50RW5hYmxlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VU cmFja2luZ1JlcXVlc3RTZW50ID0gdHJ1ZTsKKyAgICB9LAorCisgICAgZGlzYWJsZVJlc291cmNl VHJhY2tpbmc6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fcmVzb3VyY2VU cmFja2luZykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBpZiAodGhpcy5fcmVzb3Vy Y2VUcmFja2luZ1JlcXVlc3RTZW50KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGZ1 bmN0aW9uIG5ldHdvcmtBZ2VudERpc2FibGVkKCkKKyAgICAgICAgeworICAgICAgICAgICAgdGhp cy5fcmVzb3VyY2VUcmFja2luZyA9IGZhbHNlOworICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2VU cmFja2luZ1JlcXVlc3RTZW50ID0gZmFsc2U7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXNv dXJjZVRyYWNraW5nRGlzYWJsZWQpOworICAgICAgIH0KKworICAgICAgICBOZXR3b3JrQWdlbnQu ZGlzYWJsZShuZXR3b3JrQWdlbnREaXNhYmxlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5f cmVzb3VyY2VUcmFja2luZ1JlcXVlc3RTZW50ID0gdHJ1ZTsKKyAgICB9LAorCiAgICAgaW5mbGln aHRSZXNvdXJjZUZvclVSTDogZnVuY3Rpb24odXJsKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRo aXMuX2Rpc3BhdGNoZXIuX2luZmxpZ2h0UmVzb3VyY2VzQnlVUkxbdXJsXTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzCmluZGV4IDc0Y2Qz YjJlNjZhY2QzODk2MjIyNjI1YTgxNTk4N2E5MThiMmIxYTUuLjg1NDdhNmRiMWE4NWIyNzhhYjQ2 NmIyZDU5MzViNWQxODU2MWE0NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcwpAQCAtNTg2LDEwICs1ODYsMTMgQEAgV2ViSW5zcGVj dG9yLkNQVVByb2ZpbGVUeXBlLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMuX3Jl Y29yZGluZyA9ICF0aGlzLl9yZWNvcmRpbmc7CiAKLSAgICAgICAgaWYgKHRoaXMuX3JlY29yZGlu ZykKKyAgICAgICAgaWYgKHRoaXMuX3JlY29yZGluZykgeworICAgICAgICAgICAgV2ViSW5zcGVj dG9yLm5ldHdvcmtNYW5hZ2VyLmRpc2FibGVSZXNvdXJjZVRyYWNraW5nKCk7CiAgICAgICAgICAg ICBQcm9maWxlckFnZW50LnN0YXJ0KCk7Ci0gICAgICAgIGVsc2UKKyAgICAgICAgfSBlbHNlIHsK ICAgICAgICAgICAgIFByb2ZpbGVyQWdlbnQuc3RvcCgpOworICAgICAgICAgICAgV2ViSW5zcGVj dG9yLm5ldHdvcmtNYW5hZ2VyLmVuYWJsZVJlc291cmNlVHJhY2tpbmcoKTsKKyAgICAgICAgfQog ICAgIH0sCiAKICAgICBnZXQgd2VsY29tZU1lc3NhZ2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMKaW5kZXggZWRj NWZkZTBhMzE5OTNmNTZhZWZjZGQ0MWI5NzA5MzEyZmRmMTQ3Yi4uYjZmZjdkNTMyOGEyMTM0Yzg3 NjU1MTMyNzRhN2Q4ZGE5ZmYxMTQyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzCkBAIC0zNSw2ICszNSw4IEBA CiAgKi8KIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbCA9IGZ1bmN0aW9uKG5ldHdvcmtN YW5hZ2VyKQogeworICAgIG5ldHdvcmtNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VUcmFja2luZ0VuYWJsZWQsIHRo aXMuX29uUmVzb3VyY2VUcmFja2luZ0VuYWJsZWQsIHRoaXMpOworICAgIG5ldHdvcmtNYW5hZ2Vy LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMu UmVzb3VyY2VUcmFja2luZ0Rpc2FibGVkLCB0aGlzLl9vblJlc291cmNlVHJhY2tpbmdEaXNhYmxl ZCwgdGhpcyk7CiAgICAgbmV0d29ya01hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuTmV0d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXNvdXJjZVVwZGF0ZWQsIHRoaXMuX29uUmVz b3VyY2VVcGRhdGVkLCB0aGlzKTsKICAgICBuZXR3b3JrTWFuYWdlci5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLlJlc291cmNlRmluaXNoZWQs IHRoaXMuX29uUmVzb3VyY2VVcGRhdGVkLCB0aGlzKTsKICAgICBuZXR3b3JrTWFuYWdlci5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLlJlc291 cmNlVXBkYXRlRHJvcHBlZCwgdGhpcy5fb25SZXNvdXJjZVVwZGF0ZURyb3BwZWQsIHRoaXMpOwpA QCAtNDYsNiArNDgsOCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwgPSBmdW5jdGlv bihuZXR3b3JrTWFuYWdlcikKICAgICBQYWdlQWdlbnQuZW5hYmxlKCk7CiAKICAgICB0aGlzLl9m ZXRjaFJlc291cmNlVHJlZSgpOworICAgIHRoaXMuX3Jlc291cmNlVHJhY2tpbmcgPSBuZXR3b3Jr TWFuYWdlci5yZXNvdXJjZVRyYWNraW5nKCk7CisKICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lz dGVyUGFnZURpc3BhdGNoZXIobmV3IFdlYkluc3BlY3Rvci5QYWdlRGlzcGF0Y2hlcih0aGlzKSk7 CiAKICAgICB0aGlzLl9wZW5kaW5nQ29uc29sZU1lc3NhZ2VzID0ge307CkBAIC02Niw2ICs3MCwx OSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcyA9IHsKIH0KIAog V2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3RvdHlwZSA9IHsKKyAgICBfb25SZXNv dXJjZVRyYWNraW5nRW5hYmxlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMu X3Jlc291cmNlVHJhY2tpbmcpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMuX2Zl dGNoUmVzb3VyY2VUcmVlKCk7CisgICAgICAgIHRoaXMuX3Jlc291cmNlVHJhY2tpbmcgPSB0cnVl OworICAgIH0sCisKKyAgICBfb25SZXNvdXJjZVRyYWNraW5nRGlzYWJsZWQ6IGZ1bmN0aW9uKCkK KyAgICB7CisgICAgICAgIHRoaXMuX3Jlc291cmNlVHJhY2tpbmcgPSBmYWxzZTsKKyAgICB9LAor CiAgICAgX2ZldGNoUmVzb3VyY2VUcmVlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlz Ll9mcmFtZXMgPSB7fTsK 119153 2011-12-13 21:59:09 -0800 2011-12-14 09:11:59 -0800 Patch bug-74221-20111214095907.patch text/plain 7015 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY5OTYwNjFlZGNkMTli NDFkYjMzYjQ0YTdmN2M3NTY1MDQ0NWRlNi4uMTk5MGMyMTQxMzJmODdhMjFiNDJlM2Y3ZTNhNTA1 ZDg1YzMxYmQ1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDExLTEyLTEzICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBjb25zaWRlciBkaXNhYmxpbmcgbmV0d29yayB0cmFja2luZyB3aGlsZSBydW5uaW5nIHRo ZSBDUFUgcHJvZmlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc0MjIxCisKKyAgICAgICAgVGhlIFdlYkNvcmUgaW5zdHJ1bWVudGF0aW9uIG9uIHRo ZSBiYWNrZW5kIGFmZmVjdHMgdGhlIHBlcmZvcm1hbmNlIG9mIGluc3BlY3RlZCBwYWdlLgorICAg ICAgICBBcyB0aGUgcmVzdWx0IHRoZSBDUFUgcHJvZmlsZXIncyBzdGF0cyBkYXRhIGFyZSBmYXIg YXdheSBmcm9tIHRoZSByZWFsaXR5LgorICAgICAgICBTb2x1dGlvbjogdGhlIHByb2ZpbGVyIGNv ZGUgd2lsbCB0ZW1wb3JhcnkgZGlzYWJsZSB0aGUgcmVzb3VyY2UgdHJhY2tpbmcgb24gYmFja2Vu ZC4KKyAgICAgICAgU2lkZSBlZmZlY3Q6IHRoZSByZXNvdXJjZSB0cmVlIGdldHMgb3V0IG9mIHNp bmMgYmVjYXVzZSBpdCB1c2VzIE5ldHdvcmsgQWdlbnQncyBub3RpZmljYXRpb25zIGZvciB1cGRh dGluZyB0aGUgcmVzb3VyY2UgdHJlZS4KKyAgICAgICAgU29sdXRpb246IE5ldHdvcmtNYW5hZ2Vy IHdpbGwgcmVwb3J0IGFib3V0IHRoZSBjaGFuZ2VzIG9mIHRoZSByZXNvdXJjZSB0cmFja2luZyBz dGF0ZSBhbmQgUmVzb3VyY2VQYW5lbCB3aWxsIHJlLWZldGNoIHRoZSByZXNvdXJjZXMgdHJlZS4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu TmV0d29ya01hbmFnZXIucHJvdG90eXBlLmVuYWJsZVJlc291cmNlVHJhY2tpbmcubmV0d29ya0Fn ZW50RW5hYmxlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90 eXBlLmVuYWJsZVJlc291cmNlVHJhY2tpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdv cmtNYW5hZ2VyLnByb3RvdHlwZS5kaXNhYmxlUmVzb3VyY2VUcmFja2luZy5uZXR3b3JrQWdlbnRE aXNhYmxlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBl LmRpc2FibGVSZXNvdXJjZVRyYWNraW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1Byb2ZpbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVUeXBlLnBy b3RvdHlwZS5idXR0b25DbGlja2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlVHJlZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1v ZGVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUu X29uUmVzb3VyY2VUcmFja2luZ0VuYWJsZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291 cmNlVHJlZU1vZGVsLnByb3RvdHlwZS5fb25SZXNvdXJjZVRyYWNraW5nRGlzYWJsZWQpOgorCiAy MDExLTEyLTEzICBIYWppbWUgTW9ycml0YSAgPG1vcnJpdGFAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgQ2hyb21pdW0tTWFjIGJ1aWxkIGZpeCB0cmlhbC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCmluZGV4 IGQ2Y2Y3MDZkNWE0YTdlZDUxMjQ1OWQwZTc5OTZlNGQwMmNkNDljZGYuLjk3ZDI0ZTM1MTYyYTU3 MGQzZGZmMTE2OGNiOWMwODQxMGViOGIwZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwpAQCAtMzgsNyArMzgsOCBAQCBX ZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5fZGlzcGF0 Y2hlciA9IG5ldyBXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIodGhpcyk7CiAgICAgaWYg KFdlYkluc3BlY3Rvci5zZXR0aW5ncy5jYWNoZURpc2FibGVkLmdldCgpKQogICAgICAgICBOZXR3 b3JrQWdlbnQuc2V0Q2FjaGVEaXNhYmxlZCh0cnVlKTsKLSAgICBOZXR3b3JrQWdlbnQuZW5hYmxl KCk7CisgICAgdGhpcy5fcmVzb3VyY2VUcmFja2luZyA9IGZhbHNlOworICAgIHRoaXMuZW5hYmxl UmVzb3VyY2VUcmFja2luZygpOwogCiAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLmNhY2hlRGlz YWJsZWQuYWRkQ2hhbmdlTGlzdGVuZXIodGhpcy5fY2FjaGVEaXNhYmxlZFNldHRpbmdDaGFuZ2Vk LCB0aGlzKTsKIApAQCAtNDgsNiArNDksOCBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIg PSBmdW5jdGlvbigpCiB9CiAKIFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVz ID0geworICAgIFJlc291cmNlVHJhY2tpbmdFbmFibGVkOiAiUmVzb3VyY2VUcmFja2luZ0VuYWJs ZWQiLAorICAgIFJlc291cmNlVHJhY2tpbmdEaXNhYmxlZDogIlJlc291cmNlVHJhY2tpbmdEaXNh YmxlZCIsCiAgICAgUmVzb3VyY2VTdGFydGVkOiAiUmVzb3VyY2VTdGFydGVkIiwKICAgICBSZXNv dXJjZVVwZGF0ZWQ6ICJSZXNvdXJjZVVwZGF0ZWQiLAogICAgIFJlc291cmNlRmluaXNoZWQ6ICJS ZXNvdXJjZUZpbmlzaGVkIiwKQEAgLTcyLDYgKzc1LDM4IEBAIFdlYkluc3BlY3Rvci5OZXR3b3Jr TWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBQYWdlQWdlbnQuZ2V0UmVzb3VyY2VD b250ZW50KHJlc291cmNlLmZyYW1lSWQsIHJlc291cmNlLnVybCwgY2FsbGJhY2tXcmFwcGVyKTsK ICAgICB9LAogCisgICAgZW5hYmxlUmVzb3VyY2VUcmFja2luZzogZnVuY3Rpb24oKQorICAgIHsK KyAgICAgICAgaWYgKHRoaXMuX3Jlc291cmNlVHJhY2tpbmcpCisgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgZnVuY3Rpb24gbmV0d29ya0FnZW50RW5hYmxlZCgpCisgICAgICAgIHsKKyAg ICAgICAgICAgIGlmICh0aGlzLl9yZXNvdXJjZVRyYWNraW5nKQorICAgICAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlVHJhY2tpbmcgPSB0cnVlOworICAgICAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLk5ldHdvcmtN YW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VUcmFja2luZ0VuYWJsZWQpOworICAgICAgICB9CisK KyAgICAgICAgTmV0d29ya0FnZW50LmVuYWJsZShuZXR3b3JrQWdlbnRFbmFibGVkLmJpbmQodGhp cykpOworICAgIH0sCisKKyAgICBkaXNhYmxlUmVzb3VyY2VUcmFja2luZzogZnVuY3Rpb24oKQor ICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9yZXNvdXJjZVRyYWNraW5nKQorICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgIGZ1bmN0aW9uIG5ldHdvcmtBZ2VudERpc2FibGVkKCkKKyAgICAg ICAgeworICAgICAgICAgICAgaWYgKCF0aGlzLl9yZXNvdXJjZVRyYWNraW5nKQorICAgICAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlVHJhY2tpbmcgPSBmYWxz ZTsKKyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rv ci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLlJlc291cmNlVHJhY2tpbmdEaXNhYmxlZCk7Cisg ICAgICAgfQorCisgICAgICAgIE5ldHdvcmtBZ2VudC5kaXNhYmxlKG5ldHdvcmtBZ2VudERpc2Fi bGVkLmJpbmQodGhpcykpOworICAgIH0sCisKICAgICBpbmZsaWdodFJlc291cmNlRm9yVVJMOiBm dW5jdGlvbih1cmwpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZGlzcGF0Y2hlci5faW5m bGlnaHRSZXNvdXJjZXNCeVVSTFt1cmxdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMKaW5kZXggNzRjZDNiMmU2NmFjZDM4OTYyMjI2MjVh ODE1OTg3YTkxOGIyYjFhNS4uODU0N2E2ZGIxYTg1YjI3OGFiNDY2YjJkNTkzNWI1ZDE4NTYxYTQ1 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxl Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVW aWV3LmpzCkBAIC01ODYsMTAgKzU4NiwxMyBAQCBXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVR5cGUu cHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy5fcmVjb3JkaW5nID0gIXRoaXMuX3Jl Y29yZGluZzsKIAotICAgICAgICBpZiAodGhpcy5fcmVjb3JkaW5nKQorICAgICAgICBpZiAodGhp cy5fcmVjb3JkaW5nKSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IubmV0d29ya01hbmFnZXIu ZGlzYWJsZVJlc291cmNlVHJhY2tpbmcoKTsKICAgICAgICAgICAgIFByb2ZpbGVyQWdlbnQuc3Rh cnQoKTsKLSAgICAgICAgZWxzZQorICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgUHJvZmls ZXJBZ2VudC5zdG9wKCk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IubmV0d29ya01hbmFnZXIu ZW5hYmxlUmVzb3VyY2VUcmFja2luZygpOworICAgICAgICB9CiAgICAgfSwKIAogICAgIGdldCB3 ZWxjb21lTWVzc2FnZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcwppbmRleCBlZGM1ZmRlMGEzMTk5M2Y1NmFlZmNk ZDQxYjk3MDkzMTJmZGYxNDdiLi41ZDNhOWE4OWRkZThiYjI1OGY3ODc0NDNhMzkxOWQ3YTEyNWZi MjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlVHJlZU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VUcmVlTW9kZWwuanMKQEAgLTM1LDYgKzM1LDggQEAKICAqLwogV2ViSW5zcGVjdG9y LlJlc291cmNlVHJlZU1vZGVsID0gZnVuY3Rpb24obmV0d29ya01hbmFnZXIpCiB7CisgICAgbmV0 d29ya01hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIu RXZlbnRUeXBlcy5SZXNvdXJjZVRyYWNraW5nRW5hYmxlZCwgdGhpcy5fb25SZXNvdXJjZVRyYWNr aW5nRW5hYmxlZCwgdGhpcyk7CisgICAgbmV0d29ya01hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXNvdXJjZVRyYWNraW5nRGlz YWJsZWQsIHRoaXMuX29uUmVzb3VyY2VUcmFja2luZ0Rpc2FibGVkLCB0aGlzKTsKICAgICBuZXR3 b3JrTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5F dmVudFR5cGVzLlJlc291cmNlVXBkYXRlZCwgdGhpcy5fb25SZXNvdXJjZVVwZGF0ZWQsIHRoaXMp OwogICAgIG5ldHdvcmtNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLk5ldHdv cmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VGaW5pc2hlZCwgdGhpcy5fb25SZXNvdXJjZVVw ZGF0ZWQsIHRoaXMpOwogICAgIG5ldHdvcmtNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VVcGRhdGVEcm9wcGVkLCB0 aGlzLl9vblJlc291cmNlVXBkYXRlRHJvcHBlZCwgdGhpcyk7CkBAIC00NSw3ICs0NywxMCBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwgPSBmdW5jdGlvbihuZXR3b3JrTWFuYWdlcikK IAogICAgIFBhZ2VBZ2VudC5lbmFibGUoKTsKIAorICAgIG5ldHdvcmtNYW5hZ2VyLmVuYWJsZVJl c291cmNlVHJhY2tpbmcoKTsKKyAgICB0aGlzLl9yZXNvdXJjZVRyYWNraW5nV2FzRGlzYWJsZWQg PSBmYWxzZTsKICAgICB0aGlzLl9mZXRjaFJlc291cmNlVHJlZSgpOworCiAgICAgSW5zcGVjdG9y QmFja2VuZC5yZWdpc3RlclBhZ2VEaXNwYXRjaGVyKG5ldyBXZWJJbnNwZWN0b3IuUGFnZURpc3Bh dGNoZXIodGhpcykpOwogCiAgICAgdGhpcy5fcGVuZGluZ0NvbnNvbGVNZXNzYWdlcyA9IHt9OwpA QCAtNjYsNiArNzEsMTkgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50VHlw ZXMgPSB7CiB9CiAKIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7 CisgICAgX29uUmVzb3VyY2VUcmFja2luZ0VuYWJsZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIGlmICghdGhpcy5fcmVzb3VyY2VUcmFja2luZ1dhc0Rpc2FibGVkKQorICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB0aGlzLl9yZXNvdXJjZVRyYWNraW5nV2FzRGlzYWJsZWQgPSBmYWxz ZQorICAgICAgICB0aGlzLl9mZXRjaFJlc291cmNlVHJlZSgpOworICAgIH0sCisKKyAgICBfb25S ZXNvdXJjZVRyYWNraW5nRGlzYWJsZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMu X3Jlc291cmNlVHJhY2tpbmdXYXNEaXNhYmxlZCA9IHRydWU7CisgICAgfSwKKwogICAgIF9mZXRj aFJlc291cmNlVHJlZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fZnJhbWVzID0g e307Cg== 119231 2011-12-14 09:12:07 -0800 2011-12-14 11:35:05 -0800 Patch bug-74221-20111214211205.patch text/plain 6399 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGMwYjkyZmY0YzI5N2E5 ZTQ0MTg4OGE5YTZmMzMzZjc4YjRjNTA3Yy4uMmQ0NDVmNmRiNGJhOTYzMjU1M2RmNmEyMzVlMzg0 ODg0M2UwNDdhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDExLTEyLTEzICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBjb25zaWRlciBkaXNhYmxpbmcgbmV0d29yayB0cmFja2luZyB3aGlsZSBydW5uaW5nIHRo ZSBDUFUgcHJvZmlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc0MjIxCisKKyAgICAgICAgVGhlIFdlYkNvcmUgaW5zdHJ1bWVudGF0aW9uIG9uIHRo ZSBiYWNrZW5kIGFmZmVjdHMgdGhlIHBlcmZvcm1hbmNlIG9mIGluc3BlY3RlZCBwYWdlLgorICAg ICAgICBBcyB0aGUgcmVzdWx0IHRoZSBDUFUgcHJvZmlsZXIncyBzdGF0cyBkYXRhIGFyZSBmYXIg YXdheSBmcm9tIHRoZSByZWFsaXR5LgorICAgICAgICBTb2x1dGlvbjogdGhlIHByb2ZpbGVyIGNv ZGUgd2lsbCB0ZW1wb3JhcnkgZGlzYWJsZSB0aGUgcmVzb3VyY2UgdHJhY2tpbmcgb24gYmFja2Vu ZC4KKyAgICAgICAgU2lkZSBlZmZlY3Q6IHRoZSByZXNvdXJjZSB0cmVlIGdldHMgb3V0IG9mIHNp bmMgYmVjYXVzZSBpdCB1c2VzIE5ldHdvcmsgQWdlbnQncyBub3RpZmljYXRpb25zIGZvciB1cGRh dGluZyB0aGUgcmVzb3VyY2UgdHJlZS4KKyAgICAgICAgU29sdXRpb246IE5ldHdvcmtNYW5hZ2Vy IHdpbGwgcmVwb3J0IGFib3V0IHRoZSBjaGFuZ2VzIG9mIHRoZSByZXNvdXJjZSB0cmFja2luZyBz dGF0ZSBhbmQgUmVzb3VyY2VQYW5lbCB3aWxsIHJlLWZldGNoIHRoZSByZXNvdXJjZXMgdHJlZS4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu TmV0d29ya01hbmFnZXIucHJvdG90eXBlLmVuYWJsZVJlc291cmNlVHJhY2tpbmcubmV0d29ya0Fn ZW50RW5hYmxlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90 eXBlLmVuYWJsZVJlc291cmNlVHJhY2tpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdv cmtNYW5hZ2VyLnByb3RvdHlwZS5kaXNhYmxlUmVzb3VyY2VUcmFja2luZy5uZXR3b3JrQWdlbnRE aXNhYmxlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBl LmRpc2FibGVSZXNvdXJjZVRyYWNraW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3Jr TWFuYWdlci5wcm90b3R5cGUuaW5mbGlnaHRSZXNvdXJjZUZvclVSTCk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D UFVQcm9maWxlVHlwZS5wcm90b3R5cGUuYnV0dG9uQ2xpY2tlZCk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZVRyZWVNb2RlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVl TW9kZWwucHJvdG90eXBlLl9vblJlc291cmNlVHJhY2tpbmdFbmFibGVkKToKKwogMjAxMS0xMi0x NCAgVG9tIFNlcGV6ICA8dHNlcGV6QGNocm9taXVtLm9yZz4KIAogICAgICAgICBEb2N1bWVudExv YWRlciBzaG91bGQgcmVmIGl0cyBtYWluUmVzb3VyY2VMb2FkZXIuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwppbmRleCBkNmNm NzA2ZDVhNGE3ZWQ1MTI0NTlkMGU3OTk2ZTRkMDJjZDQ5Y2RmLi5iMzlkODRhZDUyOWVlYTA3YmEw MzYwMmU5OGI2YjJkZTMxZjdkNzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKQEAgLTM4LDcgKzM4LDkgQEAgV2ViSW5z cGVjdG9yLk5ldHdvcmtNYW5hZ2VyID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX2Rpc3BhdGNoZXIg PSBuZXcgV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyKHRoaXMpOwogICAgIGlmIChXZWJJ bnNwZWN0b3Iuc2V0dGluZ3MuY2FjaGVEaXNhYmxlZC5nZXQoKSkKICAgICAgICAgTmV0d29ya0Fn ZW50LnNldENhY2hlRGlzYWJsZWQodHJ1ZSk7CisKICAgICBOZXR3b3JrQWdlbnQuZW5hYmxlKCk7 CisgICAgdGhpcy5fcmVzb3VyY2VUcmFja2luZyA9IHRydWU7CiAKICAgICBXZWJJbnNwZWN0b3Iu c2V0dGluZ3MuY2FjaGVEaXNhYmxlZC5hZGRDaGFuZ2VMaXN0ZW5lcih0aGlzLl9jYWNoZURpc2Fi bGVkU2V0dGluZ0NoYW5nZWQsIHRoaXMpOwogCkBAIC00OCw2ICs1MCw4IEBAIFdlYkluc3BlY3Rv ci5OZXR3b3JrTWFuYWdlciA9IGZ1bmN0aW9uKCkKIH0KIAogV2ViSW5zcGVjdG9yLk5ldHdvcmtN YW5hZ2VyLkV2ZW50VHlwZXMgPSB7CisgICAgUmVzb3VyY2VUcmFja2luZ0VuYWJsZWQ6ICJSZXNv dXJjZVRyYWNraW5nRW5hYmxlZCIsCisgICAgUmVzb3VyY2VUcmFja2luZ0Rpc2FibGVkOiAiUmVz b3VyY2VUcmFja2luZ0Rpc2FibGVkIiwKICAgICBSZXNvdXJjZVN0YXJ0ZWQ6ICJSZXNvdXJjZVN0 YXJ0ZWQiLAogICAgIFJlc291cmNlVXBkYXRlZDogIlJlc291cmNlVXBkYXRlZCIsCiAgICAgUmVz b3VyY2VGaW5pc2hlZDogIlJlc291cmNlRmluaXNoZWQiLApAQCAtNzIsNiArNzYsMzQgQEAgV2Vi SW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIFBhZ2VB Z2VudC5nZXRSZXNvdXJjZUNvbnRlbnQocmVzb3VyY2UuZnJhbWVJZCwgcmVzb3VyY2UudXJsLCBj YWxsYmFja1dyYXBwZXIpOwogICAgIH0sCiAKKyAgICBlbmFibGVSZXNvdXJjZVRyYWNraW5nOiBm dW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAodGhpcy5fcmVzb3VyY2VUcmFja2luZykKKyAg ICAgICAgICAgIHJldHVybjsKKworICAgICAgICBmdW5jdGlvbiBuZXR3b3JrQWdlbnRFbmFibGVk KCkKKyAgICAgICAgeworICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2VUcmFja2luZyA9IHRydWU7 CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3Iu TmV0d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXNvdXJjZVRyYWNraW5nRW5hYmxlZCk7CisgICAg ICAgIH0KKworICAgICAgICBOZXR3b3JrQWdlbnQuZW5hYmxlKG5ldHdvcmtBZ2VudEVuYWJsZWQu YmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIGRpc2FibGVSZXNvdXJjZVRyYWNraW5nOiBmdW5j dGlvbigpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuX3Jlc291cmNlVHJhY2tpbmcpCisgICAg ICAgICAgICByZXR1cm47CisKKyAgICAgICAgZnVuY3Rpb24gbmV0d29ya0FnZW50RGlzYWJsZWQo KQorICAgICAgICB7CisgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZVRyYWNraW5nID0gZmFsc2U7 CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3Iu TmV0d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXNvdXJjZVRyYWNraW5nRGlzYWJsZWQpOworICAg ICAgICB9CisKKyAgICAgICAgTmV0d29ya0FnZW50LmRpc2FibGUobmV0d29ya0FnZW50RGlzYWJs ZWQuYmluZCh0aGlzKSk7CisgICAgfSwKKwogICAgIGluZmxpZ2h0UmVzb3VyY2VGb3JVUkw6IGZ1 bmN0aW9uKHVybCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9kaXNwYXRjaGVyLl9pbmZs aWdodFJlc291cmNlc0J5VVJMW3VybF07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcwppbmRleCA3NGNkM2IyZTY2YWNkMzg5NjIyMjYyNWE4 MTU5ODdhOTE4YjJiMWE1Li44NTQ3YTZkYjFhODViMjc4YWI0NjZiMmQ1OTM1YjVkMTg1NjFhNDUz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZp ZXcuanMKQEAgLTU4NiwxMCArNTg2LDEzIEBAIFdlYkluc3BlY3Rvci5DUFVQcm9maWxlVHlwZS5w cm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB0aGlzLl9yZWNvcmRpbmcgPSAhdGhpcy5fcmVj b3JkaW5nOwogCi0gICAgICAgIGlmICh0aGlzLl9yZWNvcmRpbmcpCisgICAgICAgIGlmICh0aGlz Ll9yZWNvcmRpbmcpIHsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5uZXR3b3JrTWFuYWdlci5k aXNhYmxlUmVzb3VyY2VUcmFja2luZygpOwogICAgICAgICAgICAgUHJvZmlsZXJBZ2VudC5zdGFy dCgpOwotICAgICAgICBlbHNlCisgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBQcm9maWxl ckFnZW50LnN0b3AoKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5uZXR3b3JrTWFuYWdlci5l bmFibGVSZXNvdXJjZVRyYWNraW5nKCk7CisgICAgICAgIH0KICAgICB9LAogCiAgICAgZ2V0IHdl bGNvbWVNZXNzYWdlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzCmluZGV4IGVkYzVmZGUwYTMxOTkzZjU2YWVmY2Rk NDFiOTcwOTMxMmZkZjE0N2IuLmQ3NGIyNTdlMzc0ZGJhZTdmNjQ0MTVlODA5YzM3NjczMjU0YzQ1 NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2VUcmVlTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZVRyZWVNb2RlbC5qcwpAQCAtMzUsNiArMzUsNyBAQAogICovCiBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VUcmVlTW9kZWwgPSBmdW5jdGlvbihuZXR3b3JrTWFuYWdlcikKIHsKKyAgICBuZXR3 b3JrTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5F dmVudFR5cGVzLlJlc291cmNlVHJhY2tpbmdFbmFibGVkLCB0aGlzLl9vblJlc291cmNlVHJhY2tp bmdFbmFibGVkLCB0aGlzKTsKICAgICBuZXR3b3JrTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLlJlc291cmNlVXBkYXRlZCwgdGhp cy5fb25SZXNvdXJjZVVwZGF0ZWQsIHRoaXMpOwogICAgIG5ldHdvcmtNYW5hZ2VyLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VG aW5pc2hlZCwgdGhpcy5fb25SZXNvdXJjZVVwZGF0ZWQsIHRoaXMpOwogICAgIG5ldHdvcmtNYW5h Z2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlw ZXMuUmVzb3VyY2VVcGRhdGVEcm9wcGVkLCB0aGlzLl9vblJlc291cmNlVXBkYXRlRHJvcHBlZCwg dGhpcyk7CkBAIC00NSw3ICs0Niw5IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbCA9 IGZ1bmN0aW9uKG5ldHdvcmtNYW5hZ2VyKQogCiAgICAgUGFnZUFnZW50LmVuYWJsZSgpOwogCisg ICAgTmV0d29ya0FnZW50LmVuYWJsZSgpOwogICAgIHRoaXMuX2ZldGNoUmVzb3VyY2VUcmVlKCk7 CisKICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyUGFnZURpc3BhdGNoZXIobmV3IFdlYklu c3BlY3Rvci5QYWdlRGlzcGF0Y2hlcih0aGlzKSk7CiAKICAgICB0aGlzLl9wZW5kaW5nQ29uc29s ZU1lc3NhZ2VzID0ge307CkBAIC02Niw2ICs2OSwxMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VU cmVlTW9kZWwuRXZlbnRUeXBlcyA9IHsKIH0KIAogV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1v ZGVsLnByb3RvdHlwZSA9IHsKKyAgICBfb25SZXNvdXJjZVRyYWNraW5nRW5hYmxlZDogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fZmV0Y2hSZXNvdXJjZVRyZWUoKTsKKyAgICB9LAor CiAgICAgX2ZldGNoUmVzb3VyY2VUcmVlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlz Ll9mcmFtZXMgPSB7fTsK