30079 2009-10-05 09:57:29 -0700 unselectable resources in resource panel 2009-10-08 15:21:33 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pmuellr webkit-unassigned aroben commit-queue jeroen.bensch joepeck kmccullough timothy oldest_to_newest 152332 0 pmuellr 2009-10-05 09:57:29 -0700 See Bug 28812, comment 6. In the resources panel, there are cases where some resources are unselectable. For example, load the URL: http://www.lumacentral.com/CocaCola/index.html and you should see two resources named "execBatch". Only one is selectable. The other, when you click on it, quickly deselects itself and the selects the other one. Given the circumstances, it smells like the problem is that this is the case with resources with the same URL and method. In the example described, the resource is essentially an RPC service, where the only difference between the requests is the HTTP request payload. 152728 1 pmuellr 2009-10-06 08:15:11 -0700 It's possible to duplicate this behavior with the following HTML ----- snip here ----- testing <script> var xhr; xhr = new XMLHttpRequest(); xhr.open("POST", "http://example.org/abc", false); xhr.send("123"); xhr = new XMLHttpRequest(); xhr.open("POST", "http://example.org/abc", false); xhr.send("456"); xhr = new XMLHttpRequest(); xhr.open("POST", "http://example.org/something.else", false); xhr.send("789"); </script> ----- snip here ----- The results are somewhat intermittent; sometimes you get the can't select behavior, sometimes you can; usually you can. If you don't immediately see it, reload the URL in the browser with WI still up. In those cases, you will typically see the "no content" condition of Bug 30080 as well. Smells like the problem is multiple requests with the same method/url. 152751 2 jeroen.bensch 2009-10-06 09:21:54 -0700 (In reply to comment #1) You can _always_ select the first "abc" by clicking _on_ the "abc" text for the first one and dragging slightly upwards, or clicking anywhere in the first "abc" and drag until the overlay appears that appears when attempting to drag it out of the window... So this could be a simple missing "resourcesList.selectedItem" (I don't know) update when clicking it... something trivial GUI-like? 152797 3 pmuellr 2009-10-06 11:28:20 -0700 If you look at a trace of the relevant methods invoked, it turns out everything pretty much goes as planned, but then WebInspector.documentClick() is invoked because the item in the Resources list is actually living in an <a> element. You can see in that code that what ends up happening is that WebInspector.showResourceForURL() is invoked. That method only takes the href as a parameter. At that point, all hell breaks loose. In theory then, this would break if you had an XHR with a "GET" followed by a "DELETE" as well, since the href would be the same for them. Seems to me like the WebInspector.documentClick() functionality isn't needed here. And that the <a> in the item in the Resources isn't really needed; clicking on those items is handled by the tree code itself. So, I did the simplest possible thing. In WebInspector.ResourceSidebarTreeElement.prototype.onattach(), I changed the following code: var link = document.createElement("a"); link.href = this.resource.url; to: var link = document.createElement("span"); to see what would happen. This changes the <a> element to a <span>, so WebInspector.documentClick() isn't invoked anymore. Voila! Now it works. The question is, what did this break? Is anyone else dependent on the Resources elements list? If not, a nicer looking modification than what I just did should suffice as a fix. Presumably change the name of the var from "link" to "span" or "element". 152819 4 pmuellr 2009-10-06 12:23:24 -0700 Given what I know about this, another way it can get screwed up, even after removing the link, would be if you could somehow click an actual link to something - say an <a> element in an Elements display, which somehow pointed back to a resource with the same URL as the one you were looking at, but was actually a different resource. I've been unable to duplicate this with some simple tests. Probably something you wouldn't see very often. An example might be something like an Atom feed. Say you had some XHR code that was dealing with feeds, and those XHRs were accessing the feed resource itself. Feeds often refer to themselves with 'self' sort of link. Wondering if there are other edge cases like this we might run into. Again, doesn't seem like something you'd run into very often, so I'm not worried about it right now. 153056 5 40791 pmuellr 2009-10-07 09:00:17 -0700 Created attachment 40791 proposed patch 2009/10/07 - a Removed apparently vestigal code. The ResourceSidebarTreeElements were being created by creating a new <a> element, and moving all the children in the existing tree element into the new <a> element, then making the <a> element the only child of the tree element. Basically, wrapping the existing tree element content in an <a> element. The <a> element isn't needed, because selection of the tree element is already handled by the tree element itself. The <a> element click handling was being processed by WebInspector.documentClick(), which was then selecting a potentially incorrect resource, if multiple resources with the same URL exist in the resource tree. The "invisible" CSS class is no longer used by any code in Web Inspector, as near as I can tell (search through inspector code). Test case was added with three resource retrievals of the same URL, but different sorts of invocation - two POSTs with different content, and a GET. Without the fix, only one of the three resources was selectable in the UI. 153101 6 40791 timothy 2009-10-07 10:15:27 -0700 Comment on attachment 40791 proposed patch 2009/10/07 - a So this reverts the earlier change Joe made to allow dragging resources? 153109 7 pmuellr 2009-10-07 10:46:18 -0700 (In reply to comment #6) > (From update of attachment 40791 [details]) > So this reverts the earlier change Joe made to allow dragging resources? Ahh ... woops ... it would in fact revert Bug 14410. Which we don't want to do, I assume. hmmm ... the other option, assuming we can't somehow fix this within the tree element itself, is to nullify the call to WebInspector.showResourceForURL() that happens in WebInspector.documentClick(). We could add an additional class to the <a> element called "ignoreClickEvent" which we could then check for in documentClick() and ignore those clicks. Not quite sure what's going on with the webkit-html-external/resource-link styles - perhaps there's something we can do there as well. Should add a comment to the bit in ResourceSidebarTreeElement indicating why the <a> element is being created in the first place. 153117 8 timothy 2009-10-07 11:07:50 -0700 We could reimplement Bug 14410 usign HTML5 drag and drop and not need an <a>. 153143 9 pmuellr 2009-10-07 11:55:38 -0700 (In reply to comment #8) > We could reimplement Bug 14410 usign HTML5 drag and drop and not need an <a>. I'm game for that. I have a patch now that adds a property to the <a> element which gets checked in the document's click handler and then ignores the click. Super easy and safe. But if we want to do the DnD, I won't bother; the bug isn't critical, and there is a work-around described in comment 2. 153150 10 timothy 2009-10-07 12:37:36 -0700 Drag and drop would be the most elegant fix. 153513 11 40908 pmuellr 2009-10-08 13:40:02 -0700 Created attachment 40908 proposed patch 2009/10/08 - a The ResourceSidebarTreeElements were being created by creating a new <a> element, and moving all the children in the existing tree element into the new <a> element, then making the <a> element the only child of the tree element. Basically, wrapping the existing tree element content in an <a> element. The <a> element isn't needed, because selection of the tree element is already handled by the tree element itself. The <a> element click handling was being processed by WebInspector.documentClick(), which was then selecting a potentially incorrect resource, if multiple resources with the same URL exist in the resource tree. The "invisible" CSS class is no longer used by any code in Web Inspector, as near as I can tell (search through inspector code). The reason the <a> element was added was to allow the resource elements to be dragged elsewhere and rendered on the drop target as the URL to resource. Removing the <a> element nullifies that ability. Code was added to use HTML5 DnD to perform the same function. Test case was added with three resource retrievals of the same URL, but different sorts of invocation - two POSTs with different content, and a GET. Without the fix, only one of the three resources was selectable in the UI. 153524 12 40908 commit-queue 2009-10-08 13:57:34 -0700 Comment on attachment 40908 proposed patch 2009/10/08 - a Clearing flags on attachment: 40908 Committed r49315: <http://trac.webkit.org/changeset/49315> 153525 13 commit-queue 2009-10-08 13:57:39 -0700 All reviewed patches have been landed. Closing bug. 153526 14 joepeck 2009-10-08 14:02:04 -0700 Nice solution! There was a style slip on: > ondragstart: function(event) { The brace should be on the next line. 153553 15 pmuellr 2009-10-08 15:20:47 -0700 (In reply to comment #14) Good catch. Presumably we'll be back in this code for the FIXME. Should we wait to fix it then? 153554 16 timothy 2009-10-08 15:21:33 -0700 Yes just leave it for now. 40791 2009-10-07 09:00:17 -0700 2009-10-08 13:40:02 -0700 proposed patch 2009/10/07 - a 30079.patch text/plain 3745 pmuellr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0OTI0NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMTAtMDcgIFBhdHJpY2sgTXVlbGxlciAgPFBhdHJpY2tfTXVl bGxlckB1cy5pYm0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFVuc2VsZWN0YWJsZSByZXNvdXJjZXMgaW4gcmVzb3VyY2UgcGFuZWwKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMDc5CisKKyAgICAg ICAgTWFudWFsIHRlc3QgYWRkZWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRy ZWVFbGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuY3NzOgorICAgICAgICAqIG1hbnVhbC10ZXN0cy9pbnNwZWN0b3IvZHVw bGljYXRlLXJlc291cmNlLXVybHMuaHRtbDogQWRkZWQuCisKIDIwMDktMTAtMDcgIEFkYW0gUm9i ZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0eXBvIGluIFBsdWdpblZpZXc6 OmxvYWQgdGhhdCB3YXMgY2F1c2luZyBjcm9zcy1vcmlnaW4gbG9hZHMgdG8KSW5kZXg6IFdlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMJKHJldmlzaW9uIDQ5 MjA5KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCSh3 b3JraW5nIGNvcHkpCkBAIC0xMjY5LDEyICsxMjY5LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl U2lkZWJhclRyZWVFbGVtZW50LgogICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLlNpZGViYXJU cmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2guY2FsbCh0aGlzKTsKIAotICAgICAgICB2YXIg bGluayA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImEiKTsKLSAgICAgICAgbGluay5ocmVmID0g dGhpcy5yZXNvdXJjZS51cmw7Ci0gICAgICAgIGxpbmsuY2xhc3NOYW1lID0gImludmlzaWJsZSI7 Ci0gICAgICAgIHdoaWxlICh0aGlzLl9saXN0SXRlbU5vZGUuZmlyc3RDaGlsZCkKLSAgICAgICAg ICAgIGxpbmsuYXBwZW5kQ2hpbGQodGhpcy5fbGlzdEl0ZW1Ob2RlLmZpcnN0Q2hpbGQpOwotICAg ICAgICB0aGlzLl9saXN0SXRlbU5vZGUuYXBwZW5kQ2hpbGQobGluayk7CiAgICAgICAgIHRoaXMu X2xpc3RJdGVtTm9kZS5hZGRTdHlsZUNsYXNzKCJyZXNvdXJjZXMtY2F0ZWdvcnktIiArIHRoaXMu cmVzb3VyY2UuY2F0ZWdvcnkubmFtZSk7CiAgICAgfSwKIApJbmRleDogV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MJKHJldmlzaW9uIDQ5MjA5KQorKysgV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTgyNiwx MSArODI2LDYgQEAgYm9keS5kcmF3ZXItdmlzaWJsZSAjZHJhd2VyIHsKICAgICB2ZXJ0aWNhbC1h bGlnbjogdG9wOwogfQogCi0uaW52aXNpYmxlIHsKLSAgICBjb2xvcjogaW5oZXJpdDsKLSAgICB0 ZXh0LWRlY29yYXRpb246IG5vbmU7Ci19Ci0KIC53ZWJraXQtbGluZS1ndXR0ZXItYmFja2Ryb3Ag ewogICAgIC8qIEtlZXAgdGhpcyBpbiBzeW5jIHdpdGggdmlldy1zb3VyY2UuY3NzICgud2Via2l0 LWxpbmUtZ3V0dGVyLWJhY2tkcm9wKSAqLwogICAgIHdpZHRoOiAzMXB4OwpJbmRleDogV2ViQ29y ZS9tYW51YWwtdGVzdHMvaW5zcGVjdG9yL2R1cGxpY2F0ZS1yZXNvdXJjZS11cmxzLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9tYW51YWwtdGVzdHMvaW5zcGVjdG9yL2R1cGxpY2F0ZS1yZXNv dXJjZS11cmxzLmh0bWwJKHJldmlzaW9uIDApCisrKyBXZWJDb3JlL21hbnVhbC10ZXN0cy9pbnNw ZWN0b3IvZHVwbGljYXRlLXJlc291cmNlLXVybHMuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSw0OSBAQAorPGh0bWw+Cis8aGVhZD4KKzx0aXRsZT5UZXN0cyBmb3IgQnVnIDMwMDc5PC90aXRs ZT4KKzxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9odG1sO2No YXJzZXQ9dXRmLTgiID4KKzwvaGVhZD4KKworPGJvZHk+Cis8cD5UZXN0cyBmb3IgCis8dWw+ICAg IAorPGxpPjxwPjxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zMDA3OSI+QnVnIDMwMDc5OiB1bnNlbGVjdGFibGUgcmVzb3VyY2VzIGluIHJlc291cmNlIHBh bmVsPC9hPgorPC91bD4KKworPHA+VG8gdGVzdCwgb3BlbiB0aGUgSW5zcGVjdG9yIG9uIHRoaXMg cGFnZSwgZ28gdG8gdGhlIFJlc291cmNlcyBwYW5lbC4KKworPHA+Rmlyc3Qgb2ZmLCB5b3Ugc2hv dWxkIGJlIGFibGUgdG8gYWN0dWFsbHkgc2VsZWN0IGVhY2ggImFiYyIgcmVzb3VyY2UgdG8gc2Vl Cit0aGUgSFRUUCBpbmZvIC8gY29udGVudC4gIEJ1ZyAzMDA3OSBkaWRuJ3QgYWxsb3cgeW91IHRv IHNlbGVjdCBhbGwgb2YgdGhlc2UuCisgICAgCis8cD5Gb3IgZWFjaCBvZiB0aGUgImFiYyIgcmVz b3VyY2VzIG9wZW4gdGhlIDxiPkhUVFAgSW5mb3JtYXRpb248L2I+IGFuZCAKKzxiPlJlcXVlc3Qg UGF5bG9hZDwvYj4gdHJlZSBlbGVtZW50cyBhYm92ZSB0aGUgY29udGVudC4gIE9uZSBvZiB0aGUg cmVzb3VyY2VzIAord2lsbCBub3QgaGF2ZSBhIDxiPlJlcXVlc3QgUGF5bG9hZDwvYj4uCisKKzxw PlRoZXJlIHNob3VsZCBiZSBvbmUgZWFjaCBvZiB0aGUgZm9sbG93aW5nIHJlc291cmNlczoKKyAg ICAKKzx1bD4KKzxsaT48cD5PbmUgd2l0aCBhIFJlcXVlc3QgTWV0aG9kOiBHRVQgYW5kIG5vIFJl cXVlc3QgUGF5bG9hZAorPGxpPjxwPk9uZSB3aXRoIGEgUmVxdWVzdCBNZXRob2Q6IFBPU1QgYW5k IFJlcXVlc3QgUGF5bG9hZCBvZiAiMTIzIgorPGxpPjxwPk9uZSB3aXRoIGEgUmVxdWVzdCBNZXRo b2Q6IFBPU1QgYW5kIFJlcXVlc3QgUGF5bG9hZCBvZiAiNDU2IgorPC91bD4KKyAgICAKKzxzY3Jp cHQ+CisKK3ZhciB4aHI7CisKK3hociA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOworeGhyLm9wZW4o IlBPU1QiLCAiaHR0cDovL2V4YW1wbGUub3JnL2FiYyIpOworeGhyLnNlbmQoIjEyMyIpOworCit4 aHIgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsKK3hoci5vcGVuKCJQT1NUIiwgImh0dHA6Ly9leGFt cGxlLm9yZy9hYmMiKTsKK3hoci5zZW5kKCI0NTYiKTsKKworeGhyID0gbmV3IFhNTEh0dHBSZXF1 ZXN0KCk7Cit4aHIub3BlbigiR0VUIiwgImh0dHA6Ly9leGFtcGxlLm9yZy9hYmMiKTsKK3hoci5z ZW5kKCk7CisKKzwvc2NyaXB0PgorCis8L2JvZHk+Cis8L2h0bWw+Cg== 40908 2009-10-08 13:40:02 -0700 2009-10-08 13:57:34 -0700 proposed patch 2009/10/08 - a 30079.patch text/plain 5220 pmuellr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0OTMxNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMTAtMDggIFBhdHJpY2sgTXVlbGxlciAgPFBhdHJpY2tfTXVl bGxlckB1cy5pYm0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIHVuc2VsZWN0YWJsZSByZXNvdXJjZXMgaW4gcmVzb3VyY2UgcGFuZWwKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwMDc5CisKKyAgICAg ICAgbWFudWFsIHRlc3QgYWRkZWQKKyAgICAgICAgCisgICAgICAgIEFsc28gY2hhbmdlZCB0aGUg d2F5IERuRCBmb3IgcmVzb3VyY2VzIGluIHRoZSBSZXNvdXJjZXMgcGFuZWwgaXMgCisgICAgICAg IGhhbmRsZWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVs LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LnBy b3RvdHlwZS5vbmF0dGFjaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFy VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZHJhZ3N0YXJ0KToKKyAgICAgICAgKiBtYW51YWwtdGVz dHMvaW5zcGVjdG9yL2R1cGxpY2F0ZS1yZXNvdXJjZS11cmxzLmh0bWw6IEFkZGVkLgorCiAyMDA5 LTEwLTA4ICBCcmlhbiBXZWluc3RlaW4gIDxid2VpbnN0ZWluQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCShyZXZpc2lvbiA0OTI4MykKKysrIFdlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwkod29ya2luZyBjb3B5KQpA QCAtMTI2OSwxMyArMTI2OSwxMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVs ZW1lbnQuCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuU2lkZWJhclRyZWVFbGVtZW50LnBy b3RvdHlwZS5vbmF0dGFjaC5jYWxsKHRoaXMpOwogCi0gICAgICAgIHZhciBsaW5rID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiYSIpOwotICAgICAgICBsaW5rLmhyZWYgPSB0aGlzLnJlc291cmNl LnVybDsKLSAgICAgICAgbGluay5jbGFzc05hbWUgPSAiaW52aXNpYmxlIjsKLSAgICAgICAgd2hp bGUgKHRoaXMuX2xpc3RJdGVtTm9kZS5maXJzdENoaWxkKQotICAgICAgICAgICAgbGluay5hcHBl bmRDaGlsZCh0aGlzLl9saXN0SXRlbU5vZGUuZmlyc3RDaGlsZCk7Ci0gICAgICAgIHRoaXMuX2xp c3RJdGVtTm9kZS5hcHBlbmRDaGlsZChsaW5rKTsKICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2Rl LmFkZFN0eWxlQ2xhc3MoInJlc291cmNlcy1jYXRlZ29yeS0iICsgdGhpcy5yZXNvdXJjZS5jYXRl Z29yeS5uYW1lKTsKKyAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmRyYWdnYWJsZSA9IHRydWU7 CisgICAgICAgIAorICAgICAgICAvLyBGSVhNRTogc2hvdWxkIGFjdHVhbGx5IGFkZCBoYW5kbGVy IHRvIHBhcmVudCwgdG8gYmUgcmVzb2x2ZWQgdmlhCisgICAgICAgIC8vIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDIyNworICAgICAgICB0aGlzLl9saXN0SXRlbU5v ZGUuYWRkRXZlbnRMaXN0ZW5lcigiZHJhZ3N0YXJ0IiwgdGhpcy5vbmRyYWdzdGFydC5iaW5kKHRo aXMpLCBmYWxzZSk7CiAgICAgfSwKIAogICAgIG9uc2VsZWN0OiBmdW5jdGlvbigpCkBAIC0xMjg4 LDYgKzEyODcsMTMgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50Lgog ICAgICAgICBJbmplY3RlZFNjcmlwdEFjY2Vzcy5vcGVuSW5JbnNwZWN0ZWRXaW5kb3codGhpcy5y ZXNvdXJjZS51cmwsIGZ1bmN0aW9uKCkge30pOwogICAgIH0sCiAKKyAgICBvbmRyYWdzdGFydDog ZnVuY3Rpb24oZXZlbnQpIHsKKyAgICAgICAgZXZlbnQuZGF0YVRyYW5zZmVyLnNldERhdGEoInRl eHQvcGxhaW4iLCB0aGlzLnJlc291cmNlLnVybCk7CisgICAgICAgIGV2ZW50LmRhdGFUcmFuc2Zl ci5zZXREYXRhKCJ0ZXh0L3VyaS1saXN0IiwgdGhpcy5yZXNvdXJjZS51cmwgKyAiXHJcbiIpOwor ICAgICAgICBldmVudC5kYXRhVHJhbnNmZXIuZWZmZWN0QWxsb3dlZCA9ICJjb3B5IjsKKyAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgfSwKKwogICAgIGdldCBtYWluVGl0bGUoKQogICAgIHsKICAg ICAgICAgcmV0dXJuIHRoaXMucmVzb3VyY2UuZGlzcGxheU5hbWU7CkluZGV4OiBXZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwkocmV2aXNpb24gNDkyODMpCisrKyBXZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwkod29ya2luZyBjb3B5KQpAQCAt ODI2LDExICs4MjYsNiBAQCBib2R5LmRyYXdlci12aXNpYmxlICNkcmF3ZXIgewogICAgIHZlcnRp Y2FsLWFsaWduOiB0b3A7CiB9CiAKLS5pbnZpc2libGUgewotICAgIGNvbG9yOiBpbmhlcml0Owot ICAgIHRleHQtZGVjb3JhdGlvbjogbm9uZTsKLX0KLQogLndlYmtpdC1saW5lLWd1dHRlci1iYWNr ZHJvcCB7CiAgICAgLyogS2VlcCB0aGlzIGluIHN5bmMgd2l0aCB2aWV3LXNvdXJjZS5jc3MgKC53 ZWJraXQtbGluZS1ndXR0ZXItYmFja2Ryb3ApICovCiAgICAgd2lkdGg6IDMxcHg7CkluZGV4OiBX ZWJDb3JlL21hbnVhbC10ZXN0cy9pbnNwZWN0b3IvZHVwbGljYXRlLXJlc291cmNlLXVybHMuaHRt bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL21hbnVhbC10ZXN0cy9pbnNwZWN0b3IvZHVwbGljYXRl LXJlc291cmNlLXVybHMuaHRtbAkocmV2aXNpb24gMCkKKysrIFdlYkNvcmUvbWFudWFsLXRlc3Rz L2luc3BlY3Rvci9kdXBsaWNhdGUtcmVzb3VyY2UtdXJscy5odG1sCShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDYxIEBACis8aHRtbD4KKzxoZWFkPgorPHRpdGxlPlRlc3RzIGZvciBCdWcgMzAwNzk8 L3RpdGxlPgorPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0 bWw7Y2hhcnNldD11dGYtOCIgPgorPC9oZWFkPgorCis8Ym9keT4KKzxwPlRlc3RzIGZvciAKKzx1 bD4gICAgCis8bGk+PHA+PGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTMwMDc5Ij5CdWcgMzAwNzk6IHVuc2VsZWN0YWJsZSByZXNvdXJjZXMgaW4gcmVzb3Vy Y2UgcGFuZWw8L2E+Cis8L3VsPgorCis8cD5UbyB0ZXN0LCBvcGVuIHRoZSBJbnNwZWN0b3Igb24g dGhpcyBwYWdlLCBnbyB0byB0aGUgUmVzb3VyY2VzIHBhbmVsLgorCis8cD5GaXJzdCBvZmYsIHlv dSBzaG91bGQgYmUgYWJsZSB0byBhY3R1YWxseSBzZWxlY3QgZWFjaCAiYWJjIiByZXNvdXJjZSB0 byBzZWUKK3RoZSBIVFRQIGluZm8gLyBjb250ZW50LiAgQnVnIDMwMDc5IGRpZG4ndCBhbGxvdyB5 b3UgdG8gc2VsZWN0IGFsbCBvZiB0aGVzZS4KKyAgICAKKzxwPkZvciBlYWNoIG9mIHRoZSAiYWJj IiByZXNvdXJjZXMgb3BlbiB0aGUgPGI+SFRUUCBJbmZvcm1hdGlvbjwvYj4gYW5kIAorPGI+UmVx dWVzdCBQYXlsb2FkPC9iPiB0cmVlIGVsZW1lbnRzIGFib3ZlIHRoZSBjb250ZW50LiAgT25lIG9m IHRoZSByZXNvdXJjZXMgCit3aWxsIG5vdCBoYXZlIGEgPGI+UmVxdWVzdCBQYXlsb2FkPC9iPi4K KworPHA+VGhlcmUgc2hvdWxkIGJlIG9uZSBlYWNoIG9mIHRoZSBmb2xsb3dpbmcgcmVzb3VyY2Vz OgorICAgIAorPHVsPgorPGxpPjxwPk9uZSB3aXRoIGEgUmVxdWVzdCBNZXRob2Q6IEdFVCBhbmQg bm8gUmVxdWVzdCBQYXlsb2FkCis8bGk+PHA+T25lIHdpdGggYSBSZXF1ZXN0IE1ldGhvZDogUE9T VCBhbmQgUmVxdWVzdCBQYXlsb2FkIG9mICIxMjMiCis8bGk+PHA+T25lIHdpdGggYSBSZXF1ZXN0 IE1ldGhvZDogUE9TVCBhbmQgUmVxdWVzdCBQYXlsb2FkIG9mICI0NTYiCis8L3VsPgorCis8cD5B bm90aGVyIGNoYW5nZSBtYWRlIGJ5IHRoaXMgYnVnIHdhcyB0byBjaGFuZ2UgdGhlIHdheSB0aGUg ZHJhZy9kcm9wIG9mCit0aGUgcmVzb3VyY2UgaXRzZWxmIHdvcmtlZC4gIFRoZSBwcmV2aW91cyBt ZXRob2Qgb2YgaGFuZGxpbmcgZHJhZy9kcm9wIG9mCit0aGUgcmVzb3VyY2Ugd2FzIGFjdHVhbGx5 IGNhdXNpbmcgdGhlIHVuc2VsZWN0YWJpbGl0eS4gIFNvIHRoZSBkcmFnL2Ryb3AKK29mIHRoZSBy ZXNvdXJjZXMgbmVlZHMgdG8gYmUgdGVzdGVkIGFzIHdlbGwuCisKKzx1bD4KKzxsaT48cD5TZWxl Y3Qgb25lIG9mIHRoZSByZXNvdXJjZXMuCis8bGk+PHA+RHJhZyBpdCB0byBhbiBhcHBsaWNhdGlv biB0aGF0IGNhbiBhY2NlcHQgdGV4dCBvciBhIGxpbmsKKzxsaT48cD5UaGUgYXBwbGljYXRpb24g c2hvdWxkIHByb3ZpZGUgc29tZSBmZWVkYmFjayBpbmRpY2F0aW5nIGl0IHdpbGwgYWNjZXB0Cit0 aGUgZHJvcCwgYnV0IG1heSBub3QKKzxsaT5Ecm9wLCBhbmQgdGhlIFVSTCBmb3IgdGhlIHJlc291 cmNlIHNob3VsZCBiZSByZW5kZXJlZCBhcHByb3ByaWF0ZWx5LgorICAgIAorPHNjcmlwdD4KKwor dmFyIHhocjsKKworeGhyID0gbmV3IFhNTEh0dHBSZXF1ZXN0KCk7Cit4aHIub3BlbigiUE9TVCIs ICJodHRwOi8vZXhhbXBsZS5vcmcvYWJjIik7Cit4aHIuc2VuZCgiMTIzIik7CisKK3hociA9IG5l dyBYTUxIdHRwUmVxdWVzdCgpOworeGhyLm9wZW4oIlBPU1QiLCAiaHR0cDovL2V4YW1wbGUub3Jn L2FiYyIpOworeGhyLnNlbmQoIjQ1NiIpOworCit4aHIgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsK K3hoci5vcGVuKCJHRVQiLCAiaHR0cDovL2V4YW1wbGUub3JnL2FiYyIpOworeGhyLnNlbmQoKTsK KworPC9zY3JpcHQ+CisKKzwvYm9keT4KKzwvaHRtbD4K