139342 2014-12-06 09:58:41 -0800 Pending API Request URL is wrong after reloading 2016-04-18 03:36:31 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 136916 1 cgarcia webkit-unassigned andersca ap beidson commit-queue darin kling mcatanzaro sam oldest_to_newest 1053031 0 cgarcia 2014-12-06 09:58:41 -0800 It happens when reloading a web view loaded with anything but a URL, because the bf list is not updated for those cases and WebPageProxy::reload() is setting the current bf list item URL as Pending API Request URL. This also causes that progress is reported wrongly, because WebPageProxy::decidePolicyForNavigationAction() resets the Pending API Request URL when it's different than the requested URL. The page load transaction causes the progress to be changed, reporting 1.0 (the previous one), but later something < 1.0 is reported again by the progress tracker. 1053032 1 242716 cgarcia 2014-12-06 10:05:13 -0800 Created attachment 242716 Patch I've reused the new test I added for bug #136916 to test this. 1151988 2 mcatanzaro 2016-01-02 10:05:39 -0800 Owners? 1155819 3 242716 darin 2016-01-15 10:20:44 -0800 Comment on attachment 242716 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242716&action=review I’m saying review+ but I am not 100% sure this is right. > Source/WebKit2/UIProcess/WebPageProxy.cpp:902 > + String url = m_pageLoadState.activeURL(); > + if (url.isEmpty() && m_backForwardList->currentItem()) > + url = m_backForwardList->currentItem()->url(); > + > + if (!url.isEmpty()) { Seems a little peculiar here to use isEmpty rather than isNull. I’m generally concerned that this code is trying to figure out what URL the other process will reload; we are not sending the URL over, so this is trying to predict what the other process will do? If so, then it seems that to be correct this has to match the logic in FrameLoader::reload and other loader logic inside WebCore, and it seems to me that adding this one thing it’s still far from matching it! It’s nice to fix this one particular case, but what about: - The case where there is an unreachableURL. - If a window is created by javascript, its main frame can have an empty but non-nil URL. We need to test that case. I’d like to hear Anders’s opinion. 1161243 4 cgarcia 2016-02-02 04:02:25 -0800 (In reply to comment #3) > Comment on attachment 242716 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=242716&action=review > > I’m saying review+ but I am not 100% sure this is right. > > > Source/WebKit2/UIProcess/WebPageProxy.cpp:902 > > + String url = m_pageLoadState.activeURL(); > > + if (url.isEmpty() && m_backForwardList->currentItem()) > > + url = m_backForwardList->currentItem()->url(); > > + > > + if (!url.isEmpty()) { > > Seems a little peculiar here to use isEmpty rather than isNull. > > I’m generally concerned that this code is trying to figure out what URL the > other process will reload; we are not sending the URL over, so this is > trying to predict what the other process will do? If so, then it seems that > to be correct this has to match the logic in FrameLoader::reload and other > loader logic inside WebCore, and it seems to me that adding this one thing > it’s still far from matching it! Note that this only affects the pending API request URL. This is to ensure that getting the active URL right after load or reload returns a valid URL, in case of load methods the one passed to the load. In case of reload that URL should always be the current active URL of the web view, since that's what we want to reload. If the web process ends up loading a different URL it doesn't really matter, because as soon as provisional load starts, the provisional url is used instead of the pending api request one. > It’s nice to fix this one particular case, > but what about: > > - The case where there is an unreachableURL. This case is covered by this patch, because PageLoadState::activeURL() returns the unreachable URL if there's one. > - If a window is created by javascript, its main frame can have an empty but > non-nil URL. We need to test that case. Yes, I would need to check what happens in this particular case. > I’d like to hear Anders’s opinion. 1184611 5 276622 cgarcia 2016-04-18 01:58:11 -0700 Created attachment 276622 Patch for landing 1184612 6 commit-queue 2016-04-18 01:59:13 -0700 Attachment 276622 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKit2/PendingAPIRequestURL.cpp:44: More than one command on the same line [whitespace/newline] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1184632 7 276629 cgarcia 2016-04-18 03:03:51 -0700 Created attachment 276629 Rebased patch 1184633 8 commit-queue 2016-04-18 03:05:47 -0700 Attachment 276629 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKit2/PendingAPIRequestURL.cpp:47: More than one command on the same line [whitespace/newline] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1184634 9 cgarcia 2016-04-18 03:36:31 -0700 Committed r199664: <http://trac.webkit.org/changeset/199664> 242716 2014-12-06 10:05:13 -0800 2016-04-18 01:58:11 -0700 Patch wk2-pending-api-request-url-reload.diff text/plain 8307 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlYTlkNGQ4Li5hZmY5ZGZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTQtMTItMDYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFBlbmRpbmcgQVBJIFJlcXVlc3QgVVJMIGlzIHdyb25nIGFmdGVyIHJlbG9h ZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5 MzQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQg aGFwcGVucyB3aGVuIHJlbG9hZGluZyBhIHdlYiB2aWV3IGxvYWRlZCB3aXRoIGFueXRoaW5nIGJ1 dCBhCisgICAgICAgIFVSTCwgYmVjYXVzZSB0aGUgYmYgbGlzdCBpcyBub3QgdXBkYXRlZCBmb3Ig dGhvc2UgY2FzZXMgYW5kCisgICAgICAgIFdlYlBhZ2VQcm94eTo6cmVsb2FkKCkgaXMgc2V0dGlu ZyB0aGUgY3VycmVudCBiZiBsaXN0IGl0ZW0gVVJMIGFzCisgICAgICAgIHBlbmRpbmcgQVBJIHJl cXVlc3QgVVJMLiBUaGlzIGFsc28gY2F1c2VzIHRoYXQgcHJvZ3Jlc3MgaXMKKyAgICAgICAgcmVw b3J0ZWQgd3JvbmdseSwgYmVjYXVzZQorICAgICAgICBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24oKSByZXNldHMgdGhlIHBlbmRpbmcKKyAgICAgICAgQVBJIHJl cXVlc3QgVVJMIHdoZW4gaXQncyBkaWZmZXJlbnQgdGhhbiB0aGUgcmVxdWVzdGVkIFVSTC4gVGhl CisgICAgICAgIHBhZ2UgbG9hZCB0cmFuc2FjdGlvbiBjYXVzZXMgdGhlIHByb2dyZXNzIHRvIGJl IGNoYW5nZWQsIHJlcG9ydGluZworICAgICAgICAxLjAgKHRoZSBwcmV2aW91cyBvbmUpLCBidXQg bGF0ZXIgc29tZXRoaW5nIDwgMS4wIGlzIHJlcG9ydGVkCisgICAgICAgIGFnYWluIGJ5IHRoZSBw cm9ncmVzcyB0cmFja2VyLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVsb2FkKTogVXNlIHRoZSBjdXJyZW50 IGFjdGl2ZSBVUkwgYXMKKyAgICAgICAgcGVuZGluZyBBUEkgcmVxdWVzdCBVUkwsIGZhbGxpbmcg YmFjayB0byB0aGUgY3VycmVudCBiZiBsaXN0IGl0ZW0KKyAgICAgICAgVVJMIHdoZW4gZW1wdHku CisKIDIwMTQtMTItMDMgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNzY0NTcuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDIwMjk2MGEuLjY4NWM5ZDkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC04OTUsOCArODk1LDEx IEBAIHVpbnQ2NF90IFdlYlBhZ2VQcm94eTo6cmVsb2FkKGJvb2wgcmVsb2FkRnJvbU9yaWdpbikK IHsKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4dGVuc2lvbkhhbmRsZTsK IAotICAgIGlmIChtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSkgewotICAgICAgICBT dHJpbmcgdXJsID0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPnVybCgpOworICAg IFN0cmluZyB1cmwgPSBtX3BhZ2VMb2FkU3RhdGUuYWN0aXZlVVJMKCk7CisgICAgaWYgKHVybC5p c0VtcHR5KCkgJiYgbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkpCisgICAgICAgIHVy bCA9IG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT51cmwoKTsKKworICAgIGlmICgh dXJsLmlzRW1wdHkoKSkgewogICAgICAgICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0 YXRlLnRyYW5zYWN0aW9uKCk7CiAgICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJ UmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwgdXJsKTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGJlODA1MDAuLjNmZWJkNTUgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAor MjAxNC0xMi0wNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisK KyAgICAgICAgUGVuZGluZyBBUEkgUmVxdWVzdCBVUkwgaXMgd3JvbmcgYWZ0ZXIgcmVsb2FkaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkzNDIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUg dGVzdCBjYXNlIHRvIGNoZWNrIHRoYXQgdGhlIGFjdGl2ZSBVUkwgc2hvdWxkIHJlbWFpbiB0aGUK KyAgICAgICAgc2FtZSBhZnRlciBhIHJlbG9hZC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Mi9QZW5kaW5nQVBJUmVxdWVzdFVSTC5jcHA6CisgICAgICAgIChUZXN0V2Vi S2l0QVBJOjpURVNUKToKKwogMjAxNC0xMi0wNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gTWlzc2luZyBBUEkgZGV0ZWN0ZWQgaW4g R09iamVjdCBET00gYmluZGluZ3MgYWZ0ZXIgcjE3NjYzMApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL1BlbmRpbmdBUElSZXF1ZXN0VVJMLmNwcCBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9QZW5kaW5nQVBJUmVxdWVzdFVSTC5jcHAKaW5k ZXggMWFmMDFiNy4uZDAyYTVhYyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXQyL1BlbmRpbmdBUElSZXF1ZXN0VVJMLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdDIvUGVuZGluZ0FQSVJlcXVlc3RVUkwuY3BwCkBAIC0zMSwxMSArMzEs MTkgQEAKIAogbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkgewogCitzdGF0aWMgYm9vbCBkb25lOwor CiBURVNUKFdlYktpdDIsIFBlbmRpbmdBUElSZXF1ZXN0VVJMKQogewogICAgIFdLUmV0YWluUHRy PFdLQ29udGV4dFJlZj4gY29udGV4dChBZG9wdFdLLCBXS0NvbnRleHRDcmVhdGUoKSk7CiAgICAg UGxhdGZvcm1XZWJWaWV3IHdlYlZpZXcoY29udGV4dC5nZXQoKSk7CiAKKyAgICBXS1BhZ2VMb2Fk ZXJDbGllbnRWMCBsb2FkZXJDbGllbnQ7CisgICAgbWVtc2V0KCZsb2FkZXJDbGllbnQsIDAsIHNp emVvZihsb2FkZXJDbGllbnQpKTsKKyAgICBsb2FkZXJDbGllbnQuYmFzZS52ZXJzaW9uID0gMDsK KyAgICBsb2FkZXJDbGllbnQuZGlkRmluaXNoTG9hZEZvckZyYW1lID0gW10oV0tQYWdlUmVmLCBX S0ZyYW1lUmVmLCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqKSB7IGRvbmUgPSB0cnVlOyB9OworICAg IFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQod2ViVmlldy5wYWdlKCksICZsb2FkZXJDbGllbnQu YmFzZSk7CisKICAgICBXS1JldGFpblB0cjxXS1VSTFJlZj4gYWN0aXZlVVJMID0gYWRvcHRXSyhX S1BhZ2VDb3B5QWN0aXZlVVJMKHdlYlZpZXcucGFnZSgpKSk7CiAgICAgRVhQRUNUX05VTEwoYWN0 aXZlVVJMLmdldCgpKTsKIApAQCAtNDQsNyArNTIsMTUgQEAgVEVTVChXZWJLaXQyLCBQZW5kaW5n QVBJUmVxdWVzdFVSTCkKICAgICBhY3RpdmVVUkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlBY3RpdmVV Ukwod2ViVmlldy5wYWdlKCkpKTsKICAgICBBU1NFUlRfTk9UX05VTEwoYWN0aXZlVVJMLmdldCgp KTsKICAgICBFWFBFQ1RfVFJVRShXS1VSTElzRXF1YWwoYWN0aXZlVVJMLmdldCgpLCB1cmwuZ2V0 KCkpKTsKLSAgICBXS1BhZ2VTdG9wTG9hZGluZyh3ZWJWaWV3LnBhZ2UoKSk7CisgICAgVXRpbDo6 cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBXS1BhZ2VSZWxvYWQod2ViVmll dy5wYWdlKCkpOworICAgIGFjdGl2ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2ZVVSTCh3 ZWJWaWV3LnBhZ2UoKSkpOworICAgIEFTU0VSVF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOwor ICAgIEVYUEVDVF9UUlVFKFdLVVJMSXNFcXVhbChhY3RpdmVVUkwuZ2V0KCksIHVybC5nZXQoKSkp OworICAgIFV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOwogCiAgICAgV0tSZXRh aW5QdHI8V0tTdHJpbmdSZWY+IGh0bWxTdHJpbmcgPSBVdGlsOjp0b1dLKCI8Ym9keT5IZWxsbywg V29ybGQ8L2JvZHk+Iik7CiAgICAgV0tSZXRhaW5QdHI8V0tVUkxSZWY+IGJsYW5rVVJMID0gYWRv cHRXSyhXS1VSTENyZWF0ZVdpdGhVVEY4Q1N0cmluZygiYWJvdXQ6YmxhbmsiKSk7CkBAIC01Miw0 MCArNjgsODggQEAgVEVTVChXZWJLaXQyLCBQZW5kaW5nQVBJUmVxdWVzdFVSTCkKICAgICBhY3Rp dmVVUkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlBY3RpdmVVUkwod2ViVmlldy5wYWdlKCkpKTsKICAg ICBBU1NFUlRfTk9UX05VTEwoYWN0aXZlVVJMLmdldCgpKTsKICAgICBFWFBFQ1RfVFJVRShXS1VS TElzRXF1YWwoYWN0aXZlVVJMLmdldCgpLCBibGFua1VSTC5nZXQoKSkpOwotICAgIFdLUGFnZVN0 b3BMb2FkaW5nKHdlYlZpZXcucGFnZSgpKTsKKyAgICBVdGlsOjpydW4oJmRvbmUpOworICAgIGRv bmUgPSBmYWxzZTsKIAotICAgIHVybCA9IGFkb3B0V0soV0tVUkxDcmVhdGVXaXRoVVRGOENTdHJp bmcoImh0dHA6Ly93d3cud2Via2l0Lm9yZyIpKTsKKyAgICBXS1BhZ2VSZWxvYWQod2ViVmlldy5w YWdlKCkpOworICAgIGFjdGl2ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2ZVVSTCh3ZWJW aWV3LnBhZ2UoKSkpOworICAgIEFTU0VSVF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOworICAg IEVYUEVDVF9UUlVFKFdLVVJMSXNFcXVhbChhY3RpdmVVUkwuZ2V0KCksIGJsYW5rVVJMLmdldCgp KSk7CisgICAgVXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICB1cmwg PSBhZG9wdFdLKFV0aWw6OmNyZWF0ZVVSTEZvclJlc291cmNlKCJzaW1wbGUyIiwgImh0bWwiKSk7 CiAgICAgV0tQYWdlTG9hZEhUTUxTdHJpbmcod2ViVmlldy5wYWdlKCksIGh0bWxTdHJpbmcuZ2V0 KCksIHVybC5nZXQoKSk7CiAgICAgYWN0aXZlVVJMID0gYWRvcHRXSyhXS1BhZ2VDb3B5QWN0aXZl VVJMKHdlYlZpZXcucGFnZSgpKSk7CiAgICAgQVNTRVJUX05PVF9OVUxMKGFjdGl2ZVVSTC5nZXQo KSk7CiAgICAgRVhQRUNUX1RSVUUoV0tVUkxJc0VxdWFsKGFjdGl2ZVVSTC5nZXQoKSwgdXJsLmdl dCgpKSk7Ci0gICAgV0tQYWdlU3RvcExvYWRpbmcod2ViVmlldy5wYWdlKCkpOworICAgIFV0aWw6 OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgV0tQYWdlUmVsb2FkKHdlYlZp ZXcucGFnZSgpKTsKKyAgICBhY3RpdmVVUkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlBY3RpdmVVUkwo d2ViVmlldy5wYWdlKCkpKTsKKyAgICBBU1NFUlRfTk9UX05VTEwoYWN0aXZlVVJMLmdldCgpKTsK KyAgICBFWFBFQ1RfVFJVRShXS1VSTElzRXF1YWwoYWN0aXZlVVJMLmdldCgpLCB1cmwuZ2V0KCkp KTsKKyAgICBVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKIAogICAgIFdLUmV0 YWluUHRyPFdLRGF0YVJlZj4gZGF0YSA9IGFkb3B0V0soV0tEYXRhQ3JlYXRlKG51bGxwdHIsIDAp KTsKICAgICBXS1BhZ2VMb2FkRGF0YSh3ZWJWaWV3LnBhZ2UoKSwgZGF0YS5nZXQoKSwgbnVsbHB0 ciwgbnVsbHB0ciwgbnVsbHB0cik7CiAgICAgYWN0aXZlVVJMID0gYWRvcHRXSyhXS1BhZ2VDb3B5 QWN0aXZlVVJMKHdlYlZpZXcucGFnZSgpKSk7CiAgICAgQVNTRVJUX05PVF9OVUxMKGFjdGl2ZVVS TC5nZXQoKSk7CiAgICAgRVhQRUNUX1RSVUUoV0tVUkxJc0VxdWFsKGFjdGl2ZVVSTC5nZXQoKSwg YmxhbmtVUkwuZ2V0KCkpKTsKLSAgICBXS1BhZ2VTdG9wTG9hZGluZyh3ZWJWaWV3LnBhZ2UoKSk7 CisgICAgVXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBXS1BhZ2VS ZWxvYWQod2ViVmlldy5wYWdlKCkpOworICAgIGFjdGl2ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29w eUFjdGl2ZVVSTCh3ZWJWaWV3LnBhZ2UoKSkpOworICAgIEFTU0VSVF9OT1RfTlVMTChhY3RpdmVV UkwuZ2V0KCkpOworICAgIEVYUEVDVF9UUlVFKFdLVVJMSXNFcXVhbChhY3RpdmVVUkwuZ2V0KCks IGJsYW5rVVJMLmdldCgpKSk7CisgICAgVXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFs c2U7CiAKICAgICBXS1BhZ2VMb2FkRGF0YSh3ZWJWaWV3LnBhZ2UoKSwgZGF0YS5nZXQoKSwgbnVs bHB0ciwgbnVsbHB0ciwgdXJsLmdldCgpKTsKICAgICBhY3RpdmVVUkwgPSBhZG9wdFdLKFdLUGFn ZUNvcHlBY3RpdmVVUkwod2ViVmlldy5wYWdlKCkpKTsKICAgICBBU1NFUlRfTk9UX05VTEwoYWN0 aXZlVVJMLmdldCgpKTsKICAgICBFWFBFQ1RfVFJVRShXS1VSTElzRXF1YWwoYWN0aXZlVVJMLmdl dCgpLCB1cmwuZ2V0KCkpKTsKLSAgICBXS1BhZ2VTdG9wTG9hZGluZyh3ZWJWaWV3LnBhZ2UoKSk7 CisgICAgVXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBXS1BhZ2VS ZWxvYWQod2ViVmlldy5wYWdlKCkpOworICAgIGFjdGl2ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29w eUFjdGl2ZVVSTCh3ZWJWaWV3LnBhZ2UoKSkpOworICAgIEFTU0VSVF9OT1RfTlVMTChhY3RpdmVV UkwuZ2V0KCkpOworICAgIEVYUEVDVF9UUlVFKFdLVVJMSXNFcXVhbChhY3RpdmVVUkwuZ2V0KCks IHVybC5nZXQoKSkpOworICAgIFV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOwog CiAgICAgV0tQYWdlTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcod2ViVmlldy5wYWdlKCksIGh0bWxT dHJpbmcuZ2V0KCksIG51bGxwdHIsIHVybC5nZXQoKSk7CiAgICAgYWN0aXZlVVJMID0gYWRvcHRX SyhXS1BhZ2VDb3B5QWN0aXZlVVJMKHdlYlZpZXcucGFnZSgpKSk7CiAgICAgQVNTRVJUX05PVF9O VUxMKGFjdGl2ZVVSTC5nZXQoKSk7CiAgICAgRVhQRUNUX1RSVUUoV0tVUkxJc0VxdWFsKGFjdGl2 ZVVSTC5nZXQoKSwgdXJsLmdldCgpKSk7Ci0gICAgV0tQYWdlU3RvcExvYWRpbmcod2ViVmlldy5w YWdlKCkpOworICAgIFV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAg V0tQYWdlUmVsb2FkKHdlYlZpZXcucGFnZSgpKTsKKyAgICBhY3RpdmVVUkwgPSBhZG9wdFdLKFdL UGFnZUNvcHlBY3RpdmVVUkwod2ViVmlldy5wYWdlKCkpKTsKKyAgICBBU1NFUlRfTk9UX05VTEwo YWN0aXZlVVJMLmdldCgpKTsKKyAgICBFWFBFQ1RfVFJVRShXS1VSTElzRXF1YWwoYWN0aXZlVVJM LmdldCgpLCB1cmwuZ2V0KCkpKTsKKyAgICBVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBm YWxzZTsKIAogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBwbGFpblRleHRTdHJpbmcgPSBV dGlsOjp0b1dLKCJIZWxsbywgV29ybGQiKTsKICAgICBXS1BhZ2VMb2FkUGxhaW5UZXh0U3RyaW5n KHdlYlZpZXcucGFnZSgpLCBwbGFpblRleHRTdHJpbmcuZ2V0KCkpOwogICAgIGFjdGl2ZVVSTCA9 IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2ZVVSTCh3ZWJWaWV3LnBhZ2UoKSkpOwogICAgIEFTU0VS VF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOwogICAgIEVYUEVDVF9UUlVFKFdLVVJMSXNFcXVh bChhY3RpdmVVUkwuZ2V0KCksIGJsYW5rVVJMLmdldCgpKSk7Ci0gICAgV0tQYWdlU3RvcExvYWRp bmcod2ViVmlldy5wYWdlKCkpOworICAgIFV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZh bHNlOworCisgICAgV0tQYWdlUmVsb2FkKHdlYlZpZXcucGFnZSgpKTsKKyAgICBhY3RpdmVVUkwg PSBhZG9wdFdLKFdLUGFnZUNvcHlBY3RpdmVVUkwod2ViVmlldy5wYWdlKCkpKTsKKyAgICBBU1NF UlRfTk9UX05VTEwoYWN0aXZlVVJMLmdldCgpKTsKKyAgICBFWFBFQ1RfVFJVRShXS1VSTElzRXF1 YWwoYWN0aXZlVVJMLmdldCgpLCBibGFua1VSTC5nZXQoKSkpOworICAgIFV0aWw6OnJ1bigmZG9u ZSk7CisgICAgZG9uZSA9IGZhbHNlOwogCiAgICAgdXJsID0gYWRvcHRXSyhXS1VSTENyZWF0ZVdp dGhVVEY4Q1N0cmluZygiZmlsZTovLy90bXAvaW5kZXguaHRtbCIpKTsKICAgICBXS1BhZ2VMb2Fk RmlsZSh3ZWJWaWV3LnBhZ2UoKSwgdXJsLmdldCgpLCBudWxscHRyKTsK 276622 2016-04-18 01:58:11 -0700 2016-04-18 03:03:51 -0700 Patch for landing wk2-api-request-url-reload.diff text/plain 8510 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4NWI0OWVhLi4xNTEwMTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjgg QEAKIDIwMTYtMDQtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFBlbmRpbmcgQVBJIFJlcXVlc3QgVVJMIGlzIHdyb25nIGFmdGVyIHJlbG9h ZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5 MzQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgSXQgaGFw cGVucyB3aGVuIHJlbG9hZGluZyBhIHdlYiB2aWV3IGxvYWRlZCB3aXRoIGFueXRoaW5nIGJ1dCBh CisgICAgICAgIFVSTCwgYmVjYXVzZSB0aGUgYmYgbGlzdCBpcyBub3QgdXBkYXRlZCBmb3IgdGhv c2UgY2FzZXMgYW5kCisgICAgICAgIFdlYlBhZ2VQcm94eTo6cmVsb2FkKCkgaXMgc2V0dGluZyB0 aGUgY3VycmVudCBiZiBsaXN0IGl0ZW0gVVJMIGFzCisgICAgICAgIHBlbmRpbmcgQVBJIHJlcXVl c3QgVVJMLiBUaGlzIGFsc28gY2F1c2VzIHRoYXQgcHJvZ3Jlc3MgaXMKKyAgICAgICAgcmVwb3J0 ZWQgd3JvbmdseSwgYmVjYXVzZQorICAgICAgICBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb24oKSByZXNldHMgdGhlIHBlbmRpbmcKKyAgICAgICAgQVBJIHJlcXVl c3QgVVJMIHdoZW4gaXQncyBkaWZmZXJlbnQgdGhhbiB0aGUgcmVxdWVzdGVkIFVSTC4gVGhlCisg ICAgICAgIHBhZ2UgbG9hZCB0cmFuc2FjdGlvbiBjYXVzZXMgdGhlIHByb2dyZXNzIHRvIGJlIGNo YW5nZWQsIHJlcG9ydGluZworICAgICAgICAxLjAgKHRoZSBwcmV2aW91cyBvbmUpLCBidXQgbGF0 ZXIgc29tZXRoaW5nIDwgMS4wIGlzIHJlcG9ydGVkCisgICAgICAgIGFnYWluIGJ5IHRoZSBwcm9n cmVzcyB0cmFja2VyLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVsb2FkKTogVXNlIHRoZSBjdXJyZW50IGFj dGl2ZSBVUkwgYXMKKyAgICAgICAgcGVuZGluZyBBUEkgcmVxdWVzdCBVUkwsIGZhbGxpbmcgYmFj ayB0byB0aGUgY3VycmVudCBiZiBsaXN0IGl0ZW0KKyAgICAgICAgVVJMIHdoZW4gZW1wdHkuCisK KzIwMTYtMDQtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CiAgICAgICAgIFBlbmRpbmcgQVBJIHJlcXVlc3QgVVJMIG5vIHNldCB3aGVuIGxvYWRpbmcgRGF0 YSwgQWx0ZXJuYXRlIEhUTUwgb3IgcGxhaW4gdGV4dAogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2OTE2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMDlkNTVkMS4uN2EzZTNlZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTEwOTEsOCArMTA5MSwxMSBAQCBSZWZQ dHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlbG9hZChib29sIHJlbG9hZEZyb21P cmlnaW4sIGJvb2wgY29udGVudAogewogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5k Ym94RXh0ZW5zaW9uSGFuZGxlOwogCi0gICAgaWYgKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50 SXRlbSgpKSB7Ci0gICAgICAgIFN0cmluZyB1cmwgPSBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVu dEl0ZW0oKS0+dXJsKCk7CisgICAgU3RyaW5nIHVybCA9IG1fcGFnZUxvYWRTdGF0ZS5hY3RpdmVV UkwoKTsKKyAgICBpZiAodXJsLmlzRW1wdHkoKSAmJiBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVu dEl0ZW0oKSkKKyAgICAgICAgdXJsID0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkt PnVybCgpOworCisgICAgaWYgKCF1cmwuaXNFbXB0eSgpKSB7CiAgICAgICAgIGF1dG8gdHJhbnNh Y3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKICAgICAgICAgbV9wYWdlTG9h ZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOwogCmRpZmYg LS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDk0YjE2ZC4u Y2I3ZjQ3OSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE2LTA0LTE4ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KIAorICAgICAgICBQZW5kaW5nIEFQSSBSZXF1ZXN0IFVSTCBpcyB3 cm9uZyBhZnRlciByZWxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzOTM0MgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgor CisgICAgICAgIFVwZGF0ZSB0ZXN0IGNhc2UgdG8gY2hlY2sgdGhhdCB0aGUgYWN0aXZlIFVSTCBz aG91bGQgcmVtYWluIHRoZQorICAgICAgICBzYW1lIGFmdGVyIGEgcmVsb2FkLgorCisgICAgICAg ICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL1BlbmRpbmdBUElSZXF1ZXN0VVJMLmNwcDoK KyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCisyMDE2LTA0LTE4ICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBQZW5kaW5nIEFQSSBy ZXF1ZXN0IFVSTCBubyBzZXQgd2hlbiBsb2FkaW5nIERhdGEsIEFsdGVybmF0ZSBIVE1MIG9yIHBs YWluIHRleHQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNjkxNgogCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIv UGVuZGluZ0FQSVJlcXVlc3RVUkwuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQyL1BlbmRpbmdBUElSZXF1ZXN0VVJMLmNwcAppbmRleCAxYWYwMWI3Li5kMDJhNWFjIDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvUGVuZGluZ0FQSVJlcXVl c3RVUkwuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9QZW5kaW5n QVBJUmVxdWVzdFVSTC5jcHAKQEAgLTMxLDExICszMSwxOSBAQAogCiBuYW1lc3BhY2UgVGVzdFdl YktpdEFQSSB7CiAKK3N0YXRpYyBib29sIGRvbmU7CisKIFRFU1QoV2ViS2l0MiwgUGVuZGluZ0FQ SVJlcXVlc3RVUkwpCiB7CiAgICAgV0tSZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBjb250ZXh0KEFk b3B0V0ssIFdLQ29udGV4dENyZWF0ZSgpKTsKICAgICBQbGF0Zm9ybVdlYlZpZXcgd2ViVmlldyhj b250ZXh0LmdldCgpKTsKIAorICAgIFdLUGFnZUxvYWRlckNsaWVudFYwIGxvYWRlckNsaWVudDsK KyAgICBtZW1zZXQoJmxvYWRlckNsaWVudCwgMCwgc2l6ZW9mKGxvYWRlckNsaWVudCkpOworICAg IGxvYWRlckNsaWVudC5iYXNlLnZlcnNpb24gPSAwOworICAgIGxvYWRlckNsaWVudC5kaWRGaW5p c2hMb2FkRm9yRnJhbWUgPSBbXShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIFdLVHlwZVJlZiwgY29u c3Qgdm9pZCopIHsgZG9uZSA9IHRydWU7IH07CisgICAgV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVu dCh3ZWJWaWV3LnBhZ2UoKSwgJmxvYWRlckNsaWVudC5iYXNlKTsKKwogICAgIFdLUmV0YWluUHRy PFdLVVJMUmVmPiBhY3RpdmVVUkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlBY3RpdmVVUkwod2ViVmll dy5wYWdlKCkpKTsKICAgICBFWFBFQ1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOwogCkBAIC00NCw3 ICs1MiwxNSBAQCBURVNUKFdlYktpdDIsIFBlbmRpbmdBUElSZXF1ZXN0VVJMKQogICAgIGFjdGl2 ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2ZVVSTCh3ZWJWaWV3LnBhZ2UoKSkpOwogICAg IEFTU0VSVF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOwogICAgIEVYUEVDVF9UUlVFKFdLVVJM SXNFcXVhbChhY3RpdmVVUkwuZ2V0KCksIHVybC5nZXQoKSkpOwotICAgIFdLUGFnZVN0b3BMb2Fk aW5nKHdlYlZpZXcucGFnZSgpKTsKKyAgICBVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBm YWxzZTsKKworICAgIFdLUGFnZVJlbG9hZCh3ZWJWaWV3LnBhZ2UoKSk7CisgICAgYWN0aXZlVVJM ID0gYWRvcHRXSyhXS1BhZ2VDb3B5QWN0aXZlVVJMKHdlYlZpZXcucGFnZSgpKSk7CisgICAgQVNT RVJUX05PVF9OVUxMKGFjdGl2ZVVSTC5nZXQoKSk7CisgICAgRVhQRUNUX1RSVUUoV0tVUkxJc0Vx dWFsKGFjdGl2ZVVSTC5nZXQoKSwgdXJsLmdldCgpKSk7CisgICAgVXRpbDo6cnVuKCZkb25lKTsK KyAgICBkb25lID0gZmFsc2U7CiAKICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gaHRtbFN0 cmluZyA9IFV0aWw6OnRvV0soIjxib2R5PkhlbGxvLCBXb3JsZDwvYm9keT4iKTsKICAgICBXS1Jl dGFpblB0cjxXS1VSTFJlZj4gYmxhbmtVUkwgPSBhZG9wdFdLKFdLVVJMQ3JlYXRlV2l0aFVURjhD U3RyaW5nKCJhYm91dDpibGFuayIpKTsKQEAgLTUyLDQwICs2OCw4OCBAQCBURVNUKFdlYktpdDIs IFBlbmRpbmdBUElSZXF1ZXN0VVJMKQogICAgIGFjdGl2ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29w eUFjdGl2ZVVSTCh3ZWJWaWV3LnBhZ2UoKSkpOwogICAgIEFTU0VSVF9OT1RfTlVMTChhY3RpdmVV UkwuZ2V0KCkpOwogICAgIEVYUEVDVF9UUlVFKFdLVVJMSXNFcXVhbChhY3RpdmVVUkwuZ2V0KCks IGJsYW5rVVJMLmdldCgpKSk7Ci0gICAgV0tQYWdlU3RvcExvYWRpbmcod2ViVmlldy5wYWdlKCkp OworICAgIFV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOwogCi0gICAgdXJsID0g YWRvcHRXSyhXS1VSTENyZWF0ZVdpdGhVVEY4Q1N0cmluZygiaHR0cDovL3d3dy53ZWJraXQub3Jn IikpOworICAgIFdLUGFnZVJlbG9hZCh3ZWJWaWV3LnBhZ2UoKSk7CisgICAgYWN0aXZlVVJMID0g YWRvcHRXSyhXS1BhZ2VDb3B5QWN0aXZlVVJMKHdlYlZpZXcucGFnZSgpKSk7CisgICAgQVNTRVJU X05PVF9OVUxMKGFjdGl2ZVVSTC5nZXQoKSk7CisgICAgRVhQRUNUX1RSVUUoV0tVUkxJc0VxdWFs KGFjdGl2ZVVSTC5nZXQoKSwgYmxhbmtVUkwuZ2V0KCkpKTsKKyAgICBVdGlsOjpydW4oJmRvbmUp OworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIHVybCA9IGFkb3B0V0soVXRpbDo6Y3JlYXRlVVJM Rm9yUmVzb3VyY2UoInNpbXBsZTIiLCAiaHRtbCIpKTsKICAgICBXS1BhZ2VMb2FkSFRNTFN0cmlu Zyh3ZWJWaWV3LnBhZ2UoKSwgaHRtbFN0cmluZy5nZXQoKSwgdXJsLmdldCgpKTsKICAgICBhY3Rp dmVVUkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlBY3RpdmVVUkwod2ViVmlldy5wYWdlKCkpKTsKICAg ICBBU1NFUlRfTk9UX05VTEwoYWN0aXZlVVJMLmdldCgpKTsKICAgICBFWFBFQ1RfVFJVRShXS1VS TElzRXF1YWwoYWN0aXZlVVJMLmdldCgpLCB1cmwuZ2V0KCkpKTsKLSAgICBXS1BhZ2VTdG9wTG9h ZGluZyh3ZWJWaWV3LnBhZ2UoKSk7CisgICAgVXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0g ZmFsc2U7CisKKyAgICBXS1BhZ2VSZWxvYWQod2ViVmlldy5wYWdlKCkpOworICAgIGFjdGl2ZVVS TCA9IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2ZVVSTCh3ZWJWaWV3LnBhZ2UoKSkpOworICAgIEFT U0VSVF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOworICAgIEVYUEVDVF9UUlVFKFdLVVJMSXNF cXVhbChhY3RpdmVVUkwuZ2V0KCksIHVybC5nZXQoKSkpOworICAgIFV0aWw6OnJ1bigmZG9uZSk7 CisgICAgZG9uZSA9IGZhbHNlOwogCiAgICAgV0tSZXRhaW5QdHI8V0tEYXRhUmVmPiBkYXRhID0g YWRvcHRXSyhXS0RhdGFDcmVhdGUobnVsbHB0ciwgMCkpOwogICAgIFdLUGFnZUxvYWREYXRhKHdl YlZpZXcucGFnZSgpLCBkYXRhLmdldCgpLCBudWxscHRyLCBudWxscHRyLCBudWxscHRyKTsKICAg ICBhY3RpdmVVUkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlBY3RpdmVVUkwod2ViVmlldy5wYWdlKCkp KTsKICAgICBBU1NFUlRfTk9UX05VTEwoYWN0aXZlVVJMLmdldCgpKTsKICAgICBFWFBFQ1RfVFJV RShXS1VSTElzRXF1YWwoYWN0aXZlVVJMLmdldCgpLCBibGFua1VSTC5nZXQoKSkpOwotICAgIFdL UGFnZVN0b3BMb2FkaW5nKHdlYlZpZXcucGFnZSgpKTsKKyAgICBVdGlsOjpydW4oJmRvbmUpOwor ICAgIGRvbmUgPSBmYWxzZTsKKworICAgIFdLUGFnZVJlbG9hZCh3ZWJWaWV3LnBhZ2UoKSk7Cisg ICAgYWN0aXZlVVJMID0gYWRvcHRXSyhXS1BhZ2VDb3B5QWN0aXZlVVJMKHdlYlZpZXcucGFnZSgp KSk7CisgICAgQVNTRVJUX05PVF9OVUxMKGFjdGl2ZVVSTC5nZXQoKSk7CisgICAgRVhQRUNUX1RS VUUoV0tVUkxJc0VxdWFsKGFjdGl2ZVVSTC5nZXQoKSwgYmxhbmtVUkwuZ2V0KCkpKTsKKyAgICBV dGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKIAogICAgIFdLUGFnZUxvYWREYXRh KHdlYlZpZXcucGFnZSgpLCBkYXRhLmdldCgpLCBudWxscHRyLCBudWxscHRyLCB1cmwuZ2V0KCkp OwogICAgIGFjdGl2ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2ZVVSTCh3ZWJWaWV3LnBh Z2UoKSkpOwogICAgIEFTU0VSVF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOwogICAgIEVYUEVD VF9UUlVFKFdLVVJMSXNFcXVhbChhY3RpdmVVUkwuZ2V0KCksIHVybC5nZXQoKSkpOwotICAgIFdL UGFnZVN0b3BMb2FkaW5nKHdlYlZpZXcucGFnZSgpKTsKKyAgICBVdGlsOjpydW4oJmRvbmUpOwor ICAgIGRvbmUgPSBmYWxzZTsKKworICAgIFdLUGFnZVJlbG9hZCh3ZWJWaWV3LnBhZ2UoKSk7Cisg ICAgYWN0aXZlVVJMID0gYWRvcHRXSyhXS1BhZ2VDb3B5QWN0aXZlVVJMKHdlYlZpZXcucGFnZSgp KSk7CisgICAgQVNTRVJUX05PVF9OVUxMKGFjdGl2ZVVSTC5nZXQoKSk7CisgICAgRVhQRUNUX1RS VUUoV0tVUkxJc0VxdWFsKGFjdGl2ZVVSTC5nZXQoKSwgdXJsLmdldCgpKSk7CisgICAgVXRpbDo6 cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CiAKICAgICBXS1BhZ2VMb2FkQWx0ZXJuYXRl SFRNTFN0cmluZyh3ZWJWaWV3LnBhZ2UoKSwgaHRtbFN0cmluZy5nZXQoKSwgbnVsbHB0ciwgdXJs LmdldCgpKTsKICAgICBhY3RpdmVVUkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlBY3RpdmVVUkwod2Vi Vmlldy5wYWdlKCkpKTsKICAgICBBU1NFUlRfTk9UX05VTEwoYWN0aXZlVVJMLmdldCgpKTsKICAg ICBFWFBFQ1RfVFJVRShXS1VSTElzRXF1YWwoYWN0aXZlVVJMLmdldCgpLCB1cmwuZ2V0KCkpKTsK LSAgICBXS1BhZ2VTdG9wTG9hZGluZyh3ZWJWaWV3LnBhZ2UoKSk7CisgICAgVXRpbDo6cnVuKCZk b25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBXS1BhZ2VSZWxvYWQod2ViVmlldy5wYWdl KCkpOworICAgIGFjdGl2ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2ZVVSTCh3ZWJWaWV3 LnBhZ2UoKSkpOworICAgIEFTU0VSVF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOworICAgIEVY UEVDVF9UUlVFKFdLVVJMSXNFcXVhbChhY3RpdmVVUkwuZ2V0KCksIHVybC5nZXQoKSkpOworICAg IFV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOwogCiAgICAgV0tSZXRhaW5QdHI8 V0tTdHJpbmdSZWY+IHBsYWluVGV4dFN0cmluZyA9IFV0aWw6OnRvV0soIkhlbGxvLCBXb3JsZCIp OwogICAgIFdLUGFnZUxvYWRQbGFpblRleHRTdHJpbmcod2ViVmlldy5wYWdlKCksIHBsYWluVGV4 dFN0cmluZy5nZXQoKSk7CiAgICAgYWN0aXZlVVJMID0gYWRvcHRXSyhXS1BhZ2VDb3B5QWN0aXZl VVJMKHdlYlZpZXcucGFnZSgpKSk7CiAgICAgQVNTRVJUX05PVF9OVUxMKGFjdGl2ZVVSTC5nZXQo KSk7CiAgICAgRVhQRUNUX1RSVUUoV0tVUkxJc0VxdWFsKGFjdGl2ZVVSTC5nZXQoKSwgYmxhbmtV UkwuZ2V0KCkpKTsKLSAgICBXS1BhZ2VTdG9wTG9hZGluZyh3ZWJWaWV3LnBhZ2UoKSk7CisgICAg VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBXS1BhZ2VSZWxvYWQo d2ViVmlldy5wYWdlKCkpOworICAgIGFjdGl2ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2 ZVVSTCh3ZWJWaWV3LnBhZ2UoKSkpOworICAgIEFTU0VSVF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0 KCkpOworICAgIEVYUEVDVF9UUlVFKFdLVVJMSXNFcXVhbChhY3RpdmVVUkwuZ2V0KCksIGJsYW5r VVJMLmdldCgpKSk7CisgICAgVXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CiAK ICAgICB1cmwgPSBhZG9wdFdLKFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJmaWxlOi8vL3Rt cC9pbmRleC5odG1sIikpOwogICAgIFdLUGFnZUxvYWRGaWxlKHdlYlZpZXcucGFnZSgpLCB1cmwu Z2V0KCksIG51bGxwdHIpOwo= 276629 2016-04-18 03:03:51 -0700 2016-04-18 03:03:51 -0700 Rebased patch wk2-api-request-url-reload.diff text/plain 8510 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjYTI2MTZhLi5jZGZkYjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjgg QEAKIDIwMTYtMDQtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFBlbmRpbmcgQVBJIFJlcXVlc3QgVVJMIGlzIHdyb25nIGFmdGVyIHJlbG9h ZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5 MzQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgSXQgaGFw cGVucyB3aGVuIHJlbG9hZGluZyBhIHdlYiB2aWV3IGxvYWRlZCB3aXRoIGFueXRoaW5nIGJ1dCBh CisgICAgICAgIFVSTCwgYmVjYXVzZSB0aGUgYmYgbGlzdCBpcyBub3QgdXBkYXRlZCBmb3IgdGhv c2UgY2FzZXMgYW5kCisgICAgICAgIFdlYlBhZ2VQcm94eTo6cmVsb2FkKCkgaXMgc2V0dGluZyB0 aGUgY3VycmVudCBiZiBsaXN0IGl0ZW0gVVJMIGFzCisgICAgICAgIHBlbmRpbmcgQVBJIHJlcXVl c3QgVVJMLiBUaGlzIGFsc28gY2F1c2VzIHRoYXQgcHJvZ3Jlc3MgaXMKKyAgICAgICAgcmVwb3J0 ZWQgd3JvbmdseSwgYmVjYXVzZQorICAgICAgICBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb24oKSByZXNldHMgdGhlIHBlbmRpbmcKKyAgICAgICAgQVBJIHJlcXVl c3QgVVJMIHdoZW4gaXQncyBkaWZmZXJlbnQgdGhhbiB0aGUgcmVxdWVzdGVkIFVSTC4gVGhlCisg ICAgICAgIHBhZ2UgbG9hZCB0cmFuc2FjdGlvbiBjYXVzZXMgdGhlIHByb2dyZXNzIHRvIGJlIGNo YW5nZWQsIHJlcG9ydGluZworICAgICAgICAxLjAgKHRoZSBwcmV2aW91cyBvbmUpLCBidXQgbGF0 ZXIgc29tZXRoaW5nIDwgMS4wIGlzIHJlcG9ydGVkCisgICAgICAgIGFnYWluIGJ5IHRoZSBwcm9n cmVzcyB0cmFja2VyLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVsb2FkKTogVXNlIHRoZSBjdXJyZW50IGFj dGl2ZSBVUkwgYXMKKyAgICAgICAgcGVuZGluZyBBUEkgcmVxdWVzdCBVUkwsIGZhbGxpbmcgYmFj ayB0byB0aGUgY3VycmVudCBiZiBsaXN0IGl0ZW0KKyAgICAgICAgVVJMIHdoZW4gZW1wdHkuCisK KzIwMTYtMDQtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CiAgICAgICAgIFBlbmRpbmcgQVBJIHJlcXVlc3QgVVJMIG5vIHNldCB3aGVuIGxvYWRpbmcgRGF0 YSwgQWx0ZXJuYXRlIEhUTUwgb3IgcGxhaW4gdGV4dAogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2OTE2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMDlkNTVkMS4uN2EzZTNlZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTEwOTEsOCArMTA5MSwxMSBAQCBSZWZQ dHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlbG9hZChib29sIHJlbG9hZEZyb21P cmlnaW4sIGJvb2wgY29udGVudAogewogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5k Ym94RXh0ZW5zaW9uSGFuZGxlOwogCi0gICAgaWYgKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50 SXRlbSgpKSB7Ci0gICAgICAgIFN0cmluZyB1cmwgPSBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVu dEl0ZW0oKS0+dXJsKCk7CisgICAgU3RyaW5nIHVybCA9IG1fcGFnZUxvYWRTdGF0ZS5hY3RpdmVV UkwoKTsKKyAgICBpZiAodXJsLmlzRW1wdHkoKSAmJiBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVu dEl0ZW0oKSkKKyAgICAgICAgdXJsID0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkt PnVybCgpOworCisgICAgaWYgKCF1cmwuaXNFbXB0eSgpKSB7CiAgICAgICAgIGF1dG8gdHJhbnNh Y3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKICAgICAgICAgbV9wYWdlTG9h ZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCB1cmwpOwogCmRpZmYg LS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTc2ZmIwNS4u MmUwNmFkNCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE2LTA0LTE4ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KIAorICAgICAgICBQZW5kaW5nIEFQSSBSZXF1ZXN0IFVSTCBpcyB3 cm9uZyBhZnRlciByZWxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzOTM0MgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgor CisgICAgICAgIFVwZGF0ZSB0ZXN0IGNhc2UgdG8gY2hlY2sgdGhhdCB0aGUgYWN0aXZlIFVSTCBz aG91bGQgcmVtYWluIHRoZQorICAgICAgICBzYW1lIGFmdGVyIGEgcmVsb2FkLgorCisgICAgICAg ICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL1BlbmRpbmdBUElSZXF1ZXN0VVJMLmNwcDoK KyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCisyMDE2LTA0LTE4ICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBQZW5kaW5nIEFQSSBy ZXF1ZXN0IFVSTCBubyBzZXQgd2hlbiBsb2FkaW5nIERhdGEsIEFsdGVybmF0ZSBIVE1MIG9yIHBs YWluIHRleHQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNjkxNgogCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIv UGVuZGluZ0FQSVJlcXVlc3RVUkwuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQyL1BlbmRpbmdBUElSZXF1ZXN0VVJMLmNwcAppbmRleCAwZGYyNWY5Li4yMmE4ZjA0IDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvUGVuZGluZ0FQSVJlcXVl c3RVUkwuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9QZW5kaW5n QVBJUmVxdWVzdFVSTC5jcHAKQEAgLTM0LDExICszNCwxOSBAQAogCiBuYW1lc3BhY2UgVGVzdFdl YktpdEFQSSB7CiAKK3N0YXRpYyBib29sIGRvbmU7CisKIFRFU1QoV2ViS2l0MiwgUGVuZGluZ0FQ SVJlcXVlc3RVUkwpCiB7CiAgICAgV0tSZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBjb250ZXh0KEFk b3B0V0ssIFdLQ29udGV4dENyZWF0ZSgpKTsKICAgICBQbGF0Zm9ybVdlYlZpZXcgd2ViVmlldyhj b250ZXh0LmdldCgpKTsKIAorICAgIFdLUGFnZUxvYWRlckNsaWVudFYwIGxvYWRlckNsaWVudDsK KyAgICBtZW1zZXQoJmxvYWRlckNsaWVudCwgMCwgc2l6ZW9mKGxvYWRlckNsaWVudCkpOworICAg IGxvYWRlckNsaWVudC5iYXNlLnZlcnNpb24gPSAwOworICAgIGxvYWRlckNsaWVudC5kaWRGaW5p c2hMb2FkRm9yRnJhbWUgPSBbXShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIFdLVHlwZVJlZiwgY29u c3Qgdm9pZCopIHsgZG9uZSA9IHRydWU7IH07CisgICAgV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVu dCh3ZWJWaWV3LnBhZ2UoKSwgJmxvYWRlckNsaWVudC5iYXNlKTsKKwogICAgIFdLUmV0YWluUHRy PFdLVVJMUmVmPiBhY3RpdmVVUkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlBY3RpdmVVUkwod2ViVmll dy5wYWdlKCkpKTsKICAgICBFWFBFQ1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOwogCkBAIC00Nyw3 ICs1NSwxNSBAQCBURVNUKFdlYktpdDIsIFBlbmRpbmdBUElSZXF1ZXN0VVJMKQogICAgIGFjdGl2 ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2ZVVSTCh3ZWJWaWV3LnBhZ2UoKSkpOwogICAg IEFTU0VSVF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOwogICAgIEVYUEVDVF9UUlVFKFdLVVJM SXNFcXVhbChhY3RpdmVVUkwuZ2V0KCksIHVybC5nZXQoKSkpOwotICAgIFdLUGFnZVN0b3BMb2Fk aW5nKHdlYlZpZXcucGFnZSgpKTsKKyAgICBVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBm YWxzZTsKKworICAgIFdLUGFnZVJlbG9hZCh3ZWJWaWV3LnBhZ2UoKSk7CisgICAgYWN0aXZlVVJM ID0gYWRvcHRXSyhXS1BhZ2VDb3B5QWN0aXZlVVJMKHdlYlZpZXcucGFnZSgpKSk7CisgICAgQVNT RVJUX05PVF9OVUxMKGFjdGl2ZVVSTC5nZXQoKSk7CisgICAgRVhQRUNUX1RSVUUoV0tVUkxJc0Vx dWFsKGFjdGl2ZVVSTC5nZXQoKSwgdXJsLmdldCgpKSk7CisgICAgVXRpbDo6cnVuKCZkb25lKTsK KyAgICBkb25lID0gZmFsc2U7CiAKICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gaHRtbFN0 cmluZyA9IFV0aWw6OnRvV0soIjxib2R5PkhlbGxvLCBXb3JsZDwvYm9keT4iKTsKICAgICBXS1Jl dGFpblB0cjxXS1VSTFJlZj4gYmxhbmtVUkwgPSBhZG9wdFdLKFdLVVJMQ3JlYXRlV2l0aFVURjhD U3RyaW5nKCJhYm91dDpibGFuayIpKTsKQEAgLTU1LDQwICs3MSw4OCBAQCBURVNUKFdlYktpdDIs IFBlbmRpbmdBUElSZXF1ZXN0VVJMKQogICAgIGFjdGl2ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29w eUFjdGl2ZVVSTCh3ZWJWaWV3LnBhZ2UoKSkpOwogICAgIEFTU0VSVF9OT1RfTlVMTChhY3RpdmVV UkwuZ2V0KCkpOwogICAgIEVYUEVDVF9UUlVFKFdLVVJMSXNFcXVhbChhY3RpdmVVUkwuZ2V0KCks IGJsYW5rVVJMLmdldCgpKSk7Ci0gICAgV0tQYWdlU3RvcExvYWRpbmcod2ViVmlldy5wYWdlKCkp OworICAgIFV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOwogCi0gICAgdXJsID0g YWRvcHRXSyhXS1VSTENyZWF0ZVdpdGhVVEY4Q1N0cmluZygiaHR0cDovL3d3dy53ZWJraXQub3Jn IikpOworICAgIFdLUGFnZVJlbG9hZCh3ZWJWaWV3LnBhZ2UoKSk7CisgICAgYWN0aXZlVVJMID0g YWRvcHRXSyhXS1BhZ2VDb3B5QWN0aXZlVVJMKHdlYlZpZXcucGFnZSgpKSk7CisgICAgQVNTRVJU X05PVF9OVUxMKGFjdGl2ZVVSTC5nZXQoKSk7CisgICAgRVhQRUNUX1RSVUUoV0tVUkxJc0VxdWFs KGFjdGl2ZVVSTC5nZXQoKSwgYmxhbmtVUkwuZ2V0KCkpKTsKKyAgICBVdGlsOjpydW4oJmRvbmUp OworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIHVybCA9IGFkb3B0V0soVXRpbDo6Y3JlYXRlVVJM Rm9yUmVzb3VyY2UoInNpbXBsZTIiLCAiaHRtbCIpKTsKICAgICBXS1BhZ2VMb2FkSFRNTFN0cmlu Zyh3ZWJWaWV3LnBhZ2UoKSwgaHRtbFN0cmluZy5nZXQoKSwgdXJsLmdldCgpKTsKICAgICBhY3Rp dmVVUkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlBY3RpdmVVUkwod2ViVmlldy5wYWdlKCkpKTsKICAg ICBBU1NFUlRfTk9UX05VTEwoYWN0aXZlVVJMLmdldCgpKTsKICAgICBFWFBFQ1RfVFJVRShXS1VS TElzRXF1YWwoYWN0aXZlVVJMLmdldCgpLCB1cmwuZ2V0KCkpKTsKLSAgICBXS1BhZ2VTdG9wTG9h ZGluZyh3ZWJWaWV3LnBhZ2UoKSk7CisgICAgVXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0g ZmFsc2U7CisKKyAgICBXS1BhZ2VSZWxvYWQod2ViVmlldy5wYWdlKCkpOworICAgIGFjdGl2ZVVS TCA9IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2ZVVSTCh3ZWJWaWV3LnBhZ2UoKSkpOworICAgIEFT U0VSVF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOworICAgIEVYUEVDVF9UUlVFKFdLVVJMSXNF cXVhbChhY3RpdmVVUkwuZ2V0KCksIHVybC5nZXQoKSkpOworICAgIFV0aWw6OnJ1bigmZG9uZSk7 CisgICAgZG9uZSA9IGZhbHNlOwogCiAgICAgV0tSZXRhaW5QdHI8V0tEYXRhUmVmPiBkYXRhID0g YWRvcHRXSyhXS0RhdGFDcmVhdGUobnVsbHB0ciwgMCkpOwogICAgIFdLUGFnZUxvYWREYXRhKHdl YlZpZXcucGFnZSgpLCBkYXRhLmdldCgpLCBudWxscHRyLCBudWxscHRyLCBudWxscHRyKTsKICAg ICBhY3RpdmVVUkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlBY3RpdmVVUkwod2ViVmlldy5wYWdlKCkp KTsKICAgICBBU1NFUlRfTk9UX05VTEwoYWN0aXZlVVJMLmdldCgpKTsKICAgICBFWFBFQ1RfVFJV RShXS1VSTElzRXF1YWwoYWN0aXZlVVJMLmdldCgpLCBibGFua1VSTC5nZXQoKSkpOwotICAgIFdL UGFnZVN0b3BMb2FkaW5nKHdlYlZpZXcucGFnZSgpKTsKKyAgICBVdGlsOjpydW4oJmRvbmUpOwor ICAgIGRvbmUgPSBmYWxzZTsKKworICAgIFdLUGFnZVJlbG9hZCh3ZWJWaWV3LnBhZ2UoKSk7Cisg ICAgYWN0aXZlVVJMID0gYWRvcHRXSyhXS1BhZ2VDb3B5QWN0aXZlVVJMKHdlYlZpZXcucGFnZSgp KSk7CisgICAgQVNTRVJUX05PVF9OVUxMKGFjdGl2ZVVSTC5nZXQoKSk7CisgICAgRVhQRUNUX1RS VUUoV0tVUkxJc0VxdWFsKGFjdGl2ZVVSTC5nZXQoKSwgYmxhbmtVUkwuZ2V0KCkpKTsKKyAgICBV dGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKIAogICAgIFdLUGFnZUxvYWREYXRh KHdlYlZpZXcucGFnZSgpLCBkYXRhLmdldCgpLCBudWxscHRyLCBudWxscHRyLCB1cmwuZ2V0KCkp OwogICAgIGFjdGl2ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2ZVVSTCh3ZWJWaWV3LnBh Z2UoKSkpOwogICAgIEFTU0VSVF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOwogICAgIEVYUEVD VF9UUlVFKFdLVVJMSXNFcXVhbChhY3RpdmVVUkwuZ2V0KCksIHVybC5nZXQoKSkpOwotICAgIFdL UGFnZVN0b3BMb2FkaW5nKHdlYlZpZXcucGFnZSgpKTsKKyAgICBVdGlsOjpydW4oJmRvbmUpOwor ICAgIGRvbmUgPSBmYWxzZTsKKworICAgIFdLUGFnZVJlbG9hZCh3ZWJWaWV3LnBhZ2UoKSk7Cisg ICAgYWN0aXZlVVJMID0gYWRvcHRXSyhXS1BhZ2VDb3B5QWN0aXZlVVJMKHdlYlZpZXcucGFnZSgp KSk7CisgICAgQVNTRVJUX05PVF9OVUxMKGFjdGl2ZVVSTC5nZXQoKSk7CisgICAgRVhQRUNUX1RS VUUoV0tVUkxJc0VxdWFsKGFjdGl2ZVVSTC5nZXQoKSwgdXJsLmdldCgpKSk7CisgICAgVXRpbDo6 cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CiAKICAgICBXS1BhZ2VMb2FkQWx0ZXJuYXRl SFRNTFN0cmluZyh3ZWJWaWV3LnBhZ2UoKSwgaHRtbFN0cmluZy5nZXQoKSwgbnVsbHB0ciwgdXJs LmdldCgpKTsKICAgICBhY3RpdmVVUkwgPSBhZG9wdFdLKFdLUGFnZUNvcHlBY3RpdmVVUkwod2Vi Vmlldy5wYWdlKCkpKTsKICAgICBBU1NFUlRfTk9UX05VTEwoYWN0aXZlVVJMLmdldCgpKTsKICAg ICBFWFBFQ1RfVFJVRShXS1VSTElzRXF1YWwoYWN0aXZlVVJMLmdldCgpLCB1cmwuZ2V0KCkpKTsK LSAgICBXS1BhZ2VTdG9wTG9hZGluZyh3ZWJWaWV3LnBhZ2UoKSk7CisgICAgVXRpbDo6cnVuKCZk b25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBXS1BhZ2VSZWxvYWQod2ViVmlldy5wYWdl KCkpOworICAgIGFjdGl2ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2ZVVSTCh3ZWJWaWV3 LnBhZ2UoKSkpOworICAgIEFTU0VSVF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0KCkpOworICAgIEVY UEVDVF9UUlVFKFdLVVJMSXNFcXVhbChhY3RpdmVVUkwuZ2V0KCksIHVybC5nZXQoKSkpOworICAg IFV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOwogCiAgICAgV0tSZXRhaW5QdHI8 V0tTdHJpbmdSZWY+IHBsYWluVGV4dFN0cmluZyA9IFV0aWw6OnRvV0soIkhlbGxvLCBXb3JsZCIp OwogICAgIFdLUGFnZUxvYWRQbGFpblRleHRTdHJpbmcod2ViVmlldy5wYWdlKCksIHBsYWluVGV4 dFN0cmluZy5nZXQoKSk7CiAgICAgYWN0aXZlVVJMID0gYWRvcHRXSyhXS1BhZ2VDb3B5QWN0aXZl VVJMKHdlYlZpZXcucGFnZSgpKSk7CiAgICAgQVNTRVJUX05PVF9OVUxMKGFjdGl2ZVVSTC5nZXQo KSk7CiAgICAgRVhQRUNUX1RSVUUoV0tVUkxJc0VxdWFsKGFjdGl2ZVVSTC5nZXQoKSwgYmxhbmtV UkwuZ2V0KCkpKTsKLSAgICBXS1BhZ2VTdG9wTG9hZGluZyh3ZWJWaWV3LnBhZ2UoKSk7CisgICAg VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBXS1BhZ2VSZWxvYWQo d2ViVmlldy5wYWdlKCkpOworICAgIGFjdGl2ZVVSTCA9IGFkb3B0V0soV0tQYWdlQ29weUFjdGl2 ZVVSTCh3ZWJWaWV3LnBhZ2UoKSkpOworICAgIEFTU0VSVF9OT1RfTlVMTChhY3RpdmVVUkwuZ2V0 KCkpOworICAgIEVYUEVDVF9UUlVFKFdLVVJMSXNFcXVhbChhY3RpdmVVUkwuZ2V0KCksIGJsYW5r VVJMLmdldCgpKSk7CisgICAgVXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CiAK ICAgICB1cmwgPSBhZG9wdFdLKFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJmaWxlOi8vL3Rt cC9pbmRleC5odG1sIikpOwogICAgIFdLUGFnZUxvYWRGaWxlKHdlYlZpZXcucGFnZSgpLCB1cmwu Z2V0KCksIG51bGxwdHIpOwo=