152626 2015-12-31 14:44:57 -0800 Web Inspector: Timelines view doesn't remember how I like to sort things 2016-01-06 15:00:17 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 saam hi bburg commit-queue graouts hi joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1151779 0 saam 2015-12-31 14:44:57 -0800 I like to sort things by "Total Time". But, every time I open/close or just refresh the inspector, it defaults to sorting things by "Start Time". It would be nice if this preference was remembered. 1151780 1 webkit-bug-importer 2015-12-31 14:45:11 -0800 <rdar://problem/24029666> 1151839 2 268068 hi 2015-12-31 21:25:32 -0800 Created attachment 268068 Patch 1151840 3 hi 2015-12-31 21:26:11 -0800 Oh crap sorry @Matt I didn't notice that this was assigned to you. My bad. 1151842 4 mattbaker 2015-12-31 22:30:50 -0800 No problem. 1151881 5 268068 bburg 2016-01-01 19:47:43 -0800 Comment on attachment 268068 Patch r=me In general I would prefer to give each data grid a well-known id, and let it handle the details of saving to a setting. However, there are no other uses for such an identifier (CSS id comes to mind), so this approach is fine for the time being. 1152501 6 268068 joepeck 2016-01-04 13:46:31 -0800 Comment on attachment 268068 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268068&action=review Some comments above. I don't think any immediate concerns though, but long term they should be addressed. > Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js:809 > - var dataGrid = WebInspector.DataGrid.createSortableDataGrid(columnNames, flatValues); > + let dataGrid = WebInspector.DataGrid.createSortableDataGrid(columnNames, flatValues, "console-message-view-sort"); This one may be a bit too general. Each `console.table` will have a new Setting with the same conflicting identifier, which would cause conflicts. Not to mention each console.table saving some value to persistent storage if the user changes the sort. Might be best to not include a setting here, or having it just be a Temporary / In Memory Only Setting. (Maybe a new WebInspector.Setting subclass). > Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js:89 > - this._dataGrid = WebInspector.DataGrid.createSortableDataGrid(columnNames, values); > + this._dataGrid = WebInspector.DataGrid.createSortableDataGrid(columnNames, values, "database-table-content-view-sort"); Same here. Unless we wanted to make the identifier more specific, "database-table-content-view-sort-{table-name}". But still, this might be overkill. 1152585 7 268251 hi 2016-01-04 17:11:20 -0800 Created attachment 268251 Patch So I reverted some of the changes to make it so that the setting object is "optional", in that the DataGrid will still work without it. 1152614 8 268251 joepeck 2016-01-04 18:35:50 -0800 Comment on attachment 268251 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268251&action=review r=me! > Source/WebInspectorUI/UserInterface/Views/DataGrid.js:238 > + if (this.sortColumnIdentifier) { > + let newSortHeaderCellElement = this._headerTableCellElements.get(this.sortColumnIdentifier); Since the getter now does nothing these two lines can just access the instance variable directly (_sortColumnIdentifier). 1152649 9 268267 hi 2016-01-04 21:36:48 -0800 Created attachment 268267 Patch (In reply to comment #8) > > Source/WebInspectorUI/UserInterface/Views/DataGrid.js:238 > > + if (this.sortColumnIdentifier) { > > + let newSortHeaderCellElement = this._headerTableCellElements.get(this.sortColumnIdentifier); > > Since the getter now does nothing these two lines can just access the > instance variable directly (_sortColumnIdentifier). Oops. Fixed it. 1152659 10 268267 commit-queue 2016-01-04 22:36:00 -0800 Comment on attachment 268267 Patch Clearing flags on attachment: 268267 Committed r194574: <http://trac.webkit.org/changeset/194574> 1152660 11 commit-queue 2016-01-04 22:36:03 -0800 All reviewed patches have been landed. Closing bug. 1153083 12 268267 timothy 2016-01-06 10:33:06 -0800 Comment on attachment 268267 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268267&action=review > Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js:166 > this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending; You remember the column, but not the sort order. It would be good to remember both. 1153252 13 268267 hi 2016-01-06 15:00:17 -0800 Comment on attachment 268267 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268267&action=review >> Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js:166 >> this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending; > > You remember the column, but not the sort order. It would be good to remember both. Just made another bug for this: https://bugs.webkit.org/show_bug.cgi?id=152811 268068 2015-12-31 21:25:32 -0800 2016-01-04 17:11:20 -0800 Patch bug-152626-20151231222457.patch text/plain 20388 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZmMTM3MzM2YmQ0NGNjMjZlNDFlNDcyODkzNzhm YWQ1MTJkOWVjZWUuLjM0Y2E2NWY4YmE3YTgzODc3ZTY2MzBhMTYyNzJlYTNiNmE5OTE4NmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYyIEBACisyMDE1LTEyLTMxICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFRpbWVsaW5lcyB2aWV3IGRvZXNuJ3QgcmVtZW1iZXIgaG93IEkgbGlrZSB0byBzb3J0 IHRoaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTUyNjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q3VycmVudGx5LCBhbGwgaW5zdGFuY2VzIG9mIERhdGFHcmlkIGhhdmUgdGhlaXIgc29ydCBjb2x1 bW4gcmVzZXQgd2l0aCBlYWNoCisgICAgICAgIG9wZW4vY2xvc2Ugb2YgV2ViIEluc3BlY3Rvci4g VGhpcyBkb2Vzbid0IHJlYWxseSBtYWtlIHNlbnNlIHNlZWluZyBhcyB3ZSBzYXZlCisgICAgICAg IHRoZSB1c2VyJ3Mgc2V0dGluZ3MgaW4gbWFueSBvdGhlciBjYXNlcywgc28gdGhlIHNvcnQgbWV0 aG9kICh3aGljaCBjb2x1bW4pCisgICAgICAgIHNob3VsZCBiZSBzYXZlZCBiZXR3ZWVuIGluc3Bl Y3RvciBzZXNzaW9ucy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRp b25DYWNoZUZyYW1lQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGlj YXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcucHJvdG90eXBlLl9jcmVhdGVEYXRhR3JpZCk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VWaWV3LnByb3RvdHlwZS5fZm9ybWF0UGFy YW1ldGVyQXNUYWJsZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9y YWdlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llU3RvcmFnZUNv bnRlbnRWaWV3LnByb3RvdHlwZS5fcmVidWlsZFRhYmxlKToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5ET01TdG9yYWdlQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv RGF0YUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkRhdGFHcmlkLmNyZWF0ZVNvcnRhYmxlRGF0YUdyaWQpOgorICAgICAgICBB ZGRlZCBhIHRoaXJkIGFyZ3VtZW50IGZvciB0aGUgaWQgb2YgdGhlIHNldHRpbmcgZm9yIHN0b3Jp bmcgdGhlIHNvcnQgbWV0aG9kLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJv dG90eXBlLnNldCBzb3J0T3JkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnBy b3RvdHlwZS5nZXQgc29ydENvbHVtbklkZW50aWZpZXIpOgorICAgICAgICBSZXR1cm5zIHRoZSB2 YWx1ZSBvZiB0aGUgc2F2ZSBzZXR0aW5nIG9iamVjdC4KKworICAgICAgICAoV2ViSW5zcGVjdG9y LkRhdGFHcmlkLnByb3RvdHlwZS5zZXQgc29ydENvbHVtbklkZW50aWZpZXIpOgorICAgICAgICBV cGRhdGVzIHRoZSB2YWx1ZSBvZiB0aGUgc2F2ZSBzZXR0aW5nIG9iamVjdCwgd2hpY2ggaXMgZXhw ZWN0ZWQgdG8gaGF2ZSBiZWVuCisgICAgICAgIHNldCBiZWZvcmUgY2FsbGluZyB0aGlzIGZ1bmN0 aW9uLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLnNldCBzb3J0 Q29sdW1uSWRlbnRpZmllclNldHRpbmcpOgorICAgICAgICBJbnN0ZWFkIG9mIGp1c3Qgc2V0dGlu ZyB0aGUgb3JpZ2luYWwgc29ydCBtZXRob2Qgd2hlbiBpbnN0YW50aWF0aW5nIHRoZSBEYXRhR3Jp ZCwKKyAgICAgICAgYSBXZWJJbnNwZWN0b3IuU2V0dGluZyBvYmplY3QgaXMgbm93IHJlcXVpcmVk IHRvIGJlIHBhc3NlZCBpbiB2aWEgdGhpcyBzZXR0ZXIKKyAgICAgICAgdG8gZ2l2ZSB0aGUgRGF0 YUdyaWQgYWNjZXNzIHRvIHRoZSBzdG9yZWQgc29ydCBtZXRob2QgdmFsdWUuCisKKyAgICAgICAg KFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUuX3VwZGF0ZVNvcnRlZENvbHVtbik6Cisg ICAgICAgIE1vdmVkIHVwZGF0ZSBsb2dpYyB0byBzZXBhcmF0ZSBmdW5jdGlvbiBjYWxsZWQgYnkg Ym90aCBzb3J0Q29sdW1uSWRlbnRpZmllcgorICAgICAgICBhbmQgc29ydENvbHVtbklkZW50aWZp ZXJTZXR0aW5nLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EYXRhYmFzZVRhYmxl Q29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YWJhc2VUYWJsZUNvbnRl bnRWaWV3LnByb3RvdHlwZS5fcXVlcnlGaW5pc2hlZCk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9EYXRhYmFzZVVzZXJRdWVyeVN1Y2Nlc3NWaWV3LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRhdGFiYXNlVXNlclF1ZXJ5U3VjY2Vzc1ZpZXcpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fYnVpbGRE YXRhR3JpZFNlY3Rpb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGlt ZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmlldyk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3Lmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcpOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T Y3JpcHRUaW1lbGluZVZpZXcpOgorCiAyMDE1LTEyLTMxICBNYXR0IEJha2VyICA8bWF0dGJha2Vy QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiAiTm8gRmlsdGVyIFJlc3VsdHMi IG1lc3NhZ2Ugb3ZlcmxhcHMgRGVidWdnZXIgc2lkZWJhciBzZWN0aW9ucwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNo ZUZyYW1lQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmlldy5qcwppbmRleCBhNmVlNDJi YjNlYjM1MzQzNjU0YWZjNDAxOGYzZGM4NjY0MzlmYzJhLi45YzhjMThiNDQyMzQzNjc2YjFmZGE5 MjA0YTM2MDk1YTA2MTE1YjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmlldy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNh Y2hlRnJhbWVDb250ZW50Vmlldy5qcwpAQCAtMTYyLDcgKzE2Miw3IEBAIFdlYkluc3BlY3Rvci5B cHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50VmlldyA9IGNsYXNzIEFwcGxpY2F0aW9uQ2FjaGVG cmFtZUNvbnRlCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5EYXRh R3JpZChjb2x1bW5zKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU29ydENoYW5nZWQsIHRoaXMuX3NvcnREYXRhR3Jp ZCwgdGhpcyk7CiAKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXIg PSAidXJsIjsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0 aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJhcHBsaWNhdGlvbi1jYWNoZS1mcmFtZS1j b250ZW50LXZpZXctc29ydCIsICJ1cmwiKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9y ZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmc7CiAKICAgICAg ICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2RhdGFHcmlkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdlVmlldy5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdl Vmlldy5qcwppbmRleCBhMWE4NzQzMjhmYmZmNDFlYTc5OTc3NTQzN2RkNmY2Zjg5NmZjNmJmLi4z ZDMxYTAyNDRjODEwMDAzMWQ2OTdmYmIxOTI0MmNmOGM1YzFhYTQ5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29s ZU1lc3NhZ2VWaWV3LmpzCkBAIC04MDYsNyArODA2LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlVmlldyA9IGNsYXNzIENvbnNvbGVNZXNzYWdlVmlldyBleHRlbmRzIFdlYkluc3BlY3Rv ci4KIAogICAgICAgICAvLyBGSVhNRTogU2hvdWxkIHdlIG91dHB1dCBzb21ldGhpbmcgZXh0cmEg aWYgdGhlIHByZXZpZXcgaXMgbG9zc2xlc3M/CiAKLSAgICAgICAgdmFyIGRhdGFHcmlkID0gV2Vi SW5zcGVjdG9yLkRhdGFHcmlkLmNyZWF0ZVNvcnRhYmxlRGF0YUdyaWQoY29sdW1uTmFtZXMsIGZs YXRWYWx1ZXMpOworICAgICAgICBsZXQgZGF0YUdyaWQgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQu Y3JlYXRlU29ydGFibGVEYXRhR3JpZChjb2x1bW5OYW1lcywgZmxhdFZhbHVlcywgImNvbnNvbGUt bWVzc2FnZS12aWV3LXNvcnQiKTsKICAgICAgICAgZGF0YUdyaWQuZWxlbWVudC5jbGFzc0xpc3Qu YWRkKCJpbmxpbmUiKTsKICAgICAgICAgZWxlbWVudC5hcHBlbmRDaGlsZChkYXRhR3JpZC5lbGVt ZW50KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzCmluZGV4IDM3 NDhlYjdhMjBmOGY2Njc2ZDhhNGY1MjAxZjZjNzEzN2RlMDNmMmIuLjExNWY5Yzc2YTZlYWM0Zjg1 NTNiZjdiZDllZDkwMWE2N2I4MzAwMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29u dGVudFZpZXcuanMKQEAgLTE0Miw3ICsxNDIsNyBAQCBXZWJJbnNwZWN0b3IuQ29va2llU3RvcmFn ZUNvbnRlbnRWaWV3ID0gY2xhc3MgQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3IGV4dGVuZHMgVwog ICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYXBwZW5kQ2hpbGQobm9kZSk7CiAgICAgICAgIH0K IAotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllciA9ICJuYW1lIjsK KyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3 IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJjb29raWUtc3RvcmFnZS1jb250ZW50LXZpZXctc29ydCIs ICJuYW1lIik7CiAgICAgfQogCiAgICAgX2ZpbHRlckNvb2tpZXMoY29va2llcykKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VD b250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RPTVN0b3JhZ2VDb250ZW50Vmlldy5qcwppbmRleCA5MmYzZDcxNTJkNjlkZmQ0Yzg2ZjM4N2Ji MGEwM2M1NzZlMmYwYzViLi4yYTI1MGQzMDgyNjE2ZTI4NmEwY2NiMGEzYmIyOTQ0ZmQ2ZmUxOGI5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E T01TdG9yYWdlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmpzCkBAIC00Myw3ICs0Myw3IEBA IFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVudFZpZXcgPSBjbGFzcyBET01TdG9yYWdlQ29u dGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwCiAKICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcg V2ViSW5zcGVjdG9yLkRhdGFHcmlkKGNvbHVtbnMsIHRoaXMuX2VkaXRpbmdDYWxsYmFjay5iaW5k KHRoaXMpLCB0aGlzLl9kZWxldGVDYWxsYmFjay5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5f ZGF0YUdyaWQuc29ydE9yZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2Nl bmRpbmc7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyID0gImtl eSI7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyA9 IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygiZG9tLXN0b3JhZ2UtY29udGVudC12aWV3LXNvcnQi LCAia2V5Iik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNvcnRDaGFuZ2VkLCB0aGlzLl9zb3J0RGF0YUdyaWQsIHRo aXMpOwogCiAgICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlzLl9kYXRhR3JpZCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpz CmluZGV4IDgxZmZiNzdmYjNlNjZjN2M4ZDM5ZDM1NjlhODc4OWU0YjA0NmU2ODUuLjkzMGY5NDIx ZjdhMjZjZDM3NjgzMzk1MDM2MzEzNDVlMDJiMjY0OWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzCkBAIC0zMiw3ICsz Miw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLlZpZXcKICAgICAgICAgdGhpcy5jb2x1bW5zID0gbmV3IE1hcDsKICAgICAgICAg dGhpcy5vcmRlcmVkQ29sdW1ucyA9IFtdOwogCi0gICAgICAgIHRoaXMuX3NvcnRDb2x1bW5JZGVu dGlmaWVyID0gbnVsbDsKKyAgICAgICAgdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5n ID0gbnVsbDsKICAgICAgICAgdGhpcy5fc29ydE9yZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlk LlNvcnRPcmRlci5JbmRldGVybWluYXRlOwogCiAgICAgICAgIHRoaXMuY2hpbGRyZW4gPSBbXTsK QEAgLTk5LDcgKzk5LDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkID0gY2xhc3MgRGF0YUdyaWQg ZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB9CiAgICAgfQogCi0gICAgc3RhdGlj IGNyZWF0ZVNvcnRhYmxlRGF0YUdyaWQoY29sdW1uTmFtZXMsIHZhbHVlcykKKyAgICBzdGF0aWMg Y3JlYXRlU29ydGFibGVEYXRhR3JpZChjb2x1bW5OYW1lcywgdmFsdWVzLCBzZXR0aW5nTmFtZSkK ICAgICB7CiAgICAgICAgIHZhciBudW1Db2x1bW5zID0gY29sdW1uTmFtZXMubGVuZ3RoOwogICAg ICAgICBpZiAoIW51bUNvbHVtbnMpCkBAIC0xNTcsNyArMTU3LDcgQEAgV2ViSW5zcGVjdG9yLkRh dGFHcmlkID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAg ICBkYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5T b3J0Q2hhbmdlZCwgc29ydERhdGFHcmlkLCB0aGlzKTsKIAogICAgICAgICBkYXRhR3JpZC5zb3J0 T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZzsKLSAgICAg ICAgZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXIgPSBjb2x1bW5OYW1lc1swXTsKKyAgICAg ICAgZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rv ci5TZXR0aW5nKHNldHRpbmdOYW1lLCBjb2x1bW5OYW1lc1swXSk7CiAKICAgICAgICAgcmV0dXJu IGRhdGFHcmlkOwogICAgIH0KQEAgLTE4NCwxMCArMTg0LDEwIEBAIFdlYkluc3BlY3Rvci5EYXRh R3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKIAogICAgICAg ICB0aGlzLl9zb3J0T3JkZXIgPSBvcmRlcjsKIAotICAgICAgICBpZiAoIXRoaXMuX3NvcnRDb2x1 bW5JZGVudGlmaWVyKQorICAgICAgICBpZiAoIXRoaXMuc29ydENvbHVtbklkZW50aWZpZXIpCiAg ICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdmFyIHNvcnRIZWFkZXJDZWxsRWxlbWVudCA9 IHRoaXMuX2hlYWRlclRhYmxlQ2VsbEVsZW1lbnRzLmdldCh0aGlzLl9zb3J0Q29sdW1uSWRlbnRp Zmllcik7CisgICAgICAgIGxldCBzb3J0SGVhZGVyQ2VsbEVsZW1lbnQgPSB0aGlzLl9oZWFkZXJU YWJsZUNlbGxFbGVtZW50cy5nZXQodGhpcy5zb3J0Q29sdW1uSWRlbnRpZmllcik7CiAKICAgICAg ICAgc29ydEhlYWRlckNlbGxFbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoV2ViSW5zcGVjdG9yLkRh dGFHcmlkLlNvcnRDb2x1bW5Bc2NlbmRpbmdTdHlsZUNsYXNzTmFtZSwgdGhpcy5fc29ydE9yZGVy ID09PSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZyk7CiAgICAgICAg IHNvcnRIZWFkZXJDZWxsRWxlbWVudC5jbGFzc0xpc3QudG9nZ2xlKFdlYkluc3BlY3Rvci5EYXRh R3JpZC5Tb3J0Q29sdW1uRGVzY2VuZGluZ1N0eWxlQ2xhc3NOYW1lLCB0aGlzLl9zb3J0T3JkZXIg PT09IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuRGVzY2VuZGluZyk7CkBAIC0xOTcs MjggKzE5Nyw0MiBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBjbGFzcyBEYXRhR3JpZCBleHRl bmRzIFdlYkluc3BlY3Rvci5WaWV3CiAKICAgICBnZXQgc29ydENvbHVtbklkZW50aWZpZXIoKQog ICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyOworICAgICAg ICByZXR1cm4gdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID8gdGhpcy5fc29ydENv bHVtbklkZW50aWZpZXJTZXR0aW5nLnZhbHVlIDogbnVsbDsKICAgICB9CiAKICAgICBzZXQgc29y dENvbHVtbklkZW50aWZpZXIoY29sdW1uSWRlbnRpZmllcikKICAgICB7CisgICAgICAgIGNvbnNv bGUuYXNzZXJ0KHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyk7CiAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KGNvbHVtbklkZW50aWZpZXIgJiYgdGhpcy5jb2x1bW5zLmhhcyhjb2x1bW5J ZGVudGlmaWVyKSk7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCJzb3J0YWJsZSIgaW4gdGhpcy5j b2x1bW5zLmdldChjb2x1bW5JZGVudGlmaWVyKSk7CiAKLSAgICAgICAgaWYgKHRoaXMuX3NvcnRD b2x1bW5JZGVudGlmaWVyID09PSBjb2x1bW5JZGVudGlmaWVyKQorICAgICAgICBpZiAodGhpcy5z b3J0Q29sdW1uSWRlbnRpZmllciA9PT0gY29sdW1uSWRlbnRpZmllcikKICAgICAgICAgICAgIHJl dHVybjsKIAotICAgICAgICB2YXIgb2xkU29ydENvbHVtbklkZW50aWZpZXIgPSB0aGlzLl9zb3J0 Q29sdW1uSWRlbnRpZmllcjsKLSAgICAgICAgdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXIgPSBj b2x1bW5JZGVudGlmaWVyOworICAgICAgICBsZXQgb2xkU29ydENvbHVtbklkZW50aWZpZXIgPSB0 aGlzLnNvcnRDb2x1bW5JZGVudGlmaWVyOworICAgICAgICB0aGlzLl9zb3J0Q29sdW1uSWRlbnRp ZmllclNldHRpbmcudmFsdWUgPSBjb2x1bW5JZGVudGlmaWVyOworICAgICAgICB0aGlzLl91cGRh dGVTb3J0ZWRDb2x1bW4ob2xkU29ydENvbHVtbklkZW50aWZpZXIpOworICAgIH0KKworICAgIHNl dCBzb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcoc2V0dGluZykKKyAgICB7CisgICAgICAgIGNv bnNvbGUuYXNzZXJ0KHNldHRpbmcgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU2V0dGluZyk7CiAK KyAgICAgICAgbGV0IG9sZFNvcnRDb2x1bW5JZGVudGlmaWVyID0gdGhpcy5zb3J0Q29sdW1uSWRl bnRpZmllcjsKKyAgICAgICAgdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gc2V0 dGluZzsKKyAgICAgICAgdGhpcy5fdXBkYXRlU29ydGVkQ29sdW1uKG9sZFNvcnRDb2x1bW5JZGVu dGlmaWVyKTsKKyAgICB9CisKKyAgICBfdXBkYXRlU29ydGVkQ29sdW1uKG9sZFNvcnRDb2x1bW5J ZGVudGlmaWVyKQorICAgIHsKICAgICAgICAgaWYgKG9sZFNvcnRDb2x1bW5JZGVudGlmaWVyKSB7 Ci0gICAgICAgICAgICB2YXIgb2xkU29ydEhlYWRlckNlbGxFbGVtZW50ID0gdGhpcy5faGVhZGVy VGFibGVDZWxsRWxlbWVudHMuZ2V0KG9sZFNvcnRDb2x1bW5JZGVudGlmaWVyKTsKKyAgICAgICAg ICAgIGxldCBvbGRTb3J0SGVhZGVyQ2VsbEVsZW1lbnQgPSB0aGlzLl9oZWFkZXJUYWJsZUNlbGxF bGVtZW50cy5nZXQob2xkU29ydENvbHVtbklkZW50aWZpZXIpOwogICAgICAgICAgICAgb2xkU29y dEhlYWRlckNlbGxFbGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoV2ViSW5zcGVjdG9yLkRhdGFHcmlk LlNvcnRDb2x1bW5Bc2NlbmRpbmdTdHlsZUNsYXNzTmFtZSk7CiAgICAgICAgICAgICBvbGRTb3J0 SGVhZGVyQ2VsbEVsZW1lbnQuY2xhc3NMaXN0LnJlbW92ZShXZWJJbnNwZWN0b3IuRGF0YUdyaWQu U29ydENvbHVtbkRlc2NlbmRpbmdTdHlsZUNsYXNzTmFtZSk7CiAgICAgICAgIH0KIAotICAgICAg ICBpZiAodGhpcy5fc29ydENvbHVtbklkZW50aWZpZXIpIHsKLSAgICAgICAgICAgIHZhciBuZXdT b3J0SGVhZGVyQ2VsbEVsZW1lbnQgPSB0aGlzLl9oZWFkZXJUYWJsZUNlbGxFbGVtZW50cy5nZXQo dGhpcy5fc29ydENvbHVtbklkZW50aWZpZXIpOworICAgICAgICBpZiAodGhpcy5zb3J0Q29sdW1u SWRlbnRpZmllcikgeworICAgICAgICAgICAgbGV0IG5ld1NvcnRIZWFkZXJDZWxsRWxlbWVudCA9 IHRoaXMuX2hlYWRlclRhYmxlQ2VsbEVsZW1lbnRzLmdldCh0aGlzLnNvcnRDb2x1bW5JZGVudGlm aWVyKTsKICAgICAgICAgICAgIG5ld1NvcnRIZWFkZXJDZWxsRWxlbWVudC5jbGFzc0xpc3QudG9n Z2xlKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0Q29sdW1uQXNjZW5kaW5nU3R5bGVDbGFzc05h bWUsIHRoaXMuX3NvcnRPcmRlciA9PT0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5B c2NlbmRpbmcpOwogICAgICAgICAgICAgbmV3U29ydEhlYWRlckNlbGxFbGVtZW50LmNsYXNzTGlz dC50b2dnbGUoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRDb2x1bW5EZXNjZW5kaW5nU3R5bGVD bGFzc05hbWUsIHRoaXMuX3NvcnRPcmRlciA9PT0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRP cmRlci5EZXNjZW5kaW5nKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VUYWJsZUNvbnRlbnRWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VUYWJsZUNv bnRlbnRWaWV3LmpzCmluZGV4IDUyZDdkZWI5NjJmZDVkYjdhNmY1NWEwMmVjYzk5MmEwMzA2NDA1 MzAuLmJiZGI5NWYyNTQ4ZDYwMjlmZmFmMDk1NTg2OTcxZTI3YzNmN2FlNjcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFiYXNlVGFibGVD b250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9EYXRhYmFzZVRhYmxlQ29udGVudFZpZXcuanMKQEAgLTg2LDcgKzg2LDcgQEAgV2ViSW5z cGVjdG9yLkRhdGFiYXNlVGFibGVDb250ZW50VmlldyA9IGNsYXNzIERhdGFiYXNlVGFibGVDb250 ZW50VmlldyBleHRlbmRzIFcKICAgICAgICAgICAgIHRoaXMuX21lc3NhZ2VUZXh0Vmlld0VsZW1l bnQucmVtb3ZlKCk7CiAKICAgICAgICAgaWYgKGNvbHVtbk5hbWVzLmxlbmd0aCkgewotICAgICAg ICAgICAgdGhpcy5fZGF0YUdyaWQgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuY3JlYXRlU29ydGFi bGVEYXRhR3JpZChjb2x1bW5OYW1lcywgdmFsdWVzKTsKKyAgICAgICAgICAgIHRoaXMuX2RhdGFH cmlkID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLmNyZWF0ZVNvcnRhYmxlRGF0YUdyaWQoY29sdW1u TmFtZXMsIHZhbHVlcywgImRhdGFiYXNlLXRhYmxlLWNvbnRlbnQtdmlldy1zb3J0Iik7CiAKICAg ICAgICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlzLl9kYXRhR3JpZCk7CiAgICAgICAgICAgICB0 aGlzLl9kYXRhR3JpZC51cGRhdGVMYXlvdXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFiYXNlVXNlclF1ZXJ5U3VjY2Vzc1ZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhYmFzZVVz ZXJRdWVyeVN1Y2Nlc3NWaWV3LmpzCmluZGV4IGYyZGI2YzRhNDYzYTExYjBhYjMyNTkzZTk0MGY4 ZjNmOTkyYWQ4YWUuLmZjNDMzNGIyMjA1ZDBmMDRiMWFmNDdhZmZhMTI5MDMyMDQ4ZmIxYmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFi YXNlVXNlclF1ZXJ5U3VjY2Vzc1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VVc2VyUXVlcnlTdWNjZXNzVmlldy5qcwpAQCAtMjks NyArMjksNyBAQCBXZWJJbnNwZWN0b3IuRGF0YWJhc2VVc2VyUXVlcnlTdWNjZXNzVmlldyA9IGNs YXNzIERhdGFiYXNlVXNlclF1ZXJ5U3VjY2Vzc1ZpZXcgZQogICAgIHsKICAgICAgICAgc3VwZXIo cXVlcnkpOwogCi0gICAgICAgIHRoaXMuX2RhdGFHcmlkID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlk LmNyZWF0ZVNvcnRhYmxlRGF0YUdyaWQoY29sdW1uTmFtZXMsIHZhbHVlcyk7CisgICAgICAgIHRo aXMuX2RhdGFHcmlkID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLmNyZWF0ZVNvcnRhYmxlRGF0YUdy aWQoY29sdW1uTmFtZXMsIHZhbHVlcywgImRhdGFiYXNlLXVzZXItcXVlcnktc3VjY2Vzcy12aWV3 LXNvcnQiKTsKICAgICAgICAgaWYgKHRoaXMuX2RhdGFHcmlkKSB7CiAgICAgICAgICAgICB0aGlz Ll9kYXRhR3JpZC5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImlubGluZSIpOwogICAgICAgICAgICAg dGhpcy5yZXN1bHRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5 ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggMjI2 YmFjNzdjNGFmZjlkYTM5YTY1OGFjYzUxODZiZWUwYTY4YTBjZi4uM2E5ZTBmY2NmZDdlZWY3Yjlm YmEyMThmMmQ0NjY1ZDc3NmUxZTU1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRh aWxzU2lkZWJhclBhbmVsLmpzCkBAIC0xNDEsNyArMTQxLDcgQEAgV2ViSW5zcGVjdG9yLkxheWVy VHJlZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBMYXllclRyZWVEZXRhaWxzU2lkZWJhclBh bmVsIGUKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuRGF0YUdyaWQuRXZlbnQuU29ydENoYW5nZWQsIHRoaXMuX3NvcnREYXRhR3JpZCwgdGhpcyk7 CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRh dGFHcmlkLkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5nZWQsIHRoaXMuX3NlbGVjdGVkRGF0YUdyaWRO b2RlQ2hhbmdlZCwgdGhpcyk7CiAKLSAgICAgICAgdGhpcy5zb3J0Q29sdW1uSWRlbnRpZmllciA9 ICJtZW1vcnkiOworICAgICAgICB0aGlzLnNvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyA9IG5l dyBXZWJJbnNwZWN0b3IuU2V0dGluZygibGF5ZXItdHJlZS1kZXRhaWxzLXNpZGViYXItcGFuZWwt c29ydCIsICJtZW1vcnkiKTsKICAgICAgICAgdGhpcy5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQuU29ydE9yZGVyLkRlc2NlbmRpbmc7CiAKICAgICAgICAgdmFyIGVsZW1lbnQgPSB0 aGlzLl9kYXRhR3JpZC5lbGVtZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVWaWV3LmpzCmluZGV4 IGNhNDVhZDkwMTBhYTc1MTNmMWFkMDdjMzMxNmI5YWNlNTNlNGZkMWMuLmEyMjgwNTIwMTFjZGE5 MGNmNmNjY2M5NTA1OTMyMmU4MWY2ZGQ3Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lVmlldy5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZVZpZXcu anMKQEAgLTcyLDcgKzcyLDcgQEAgV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmlldyA9IGNs YXNzIExheW91dFRpbWVsaW5lVmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci4KICAgICAgICAgdGhp cy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3Jp ZC5FdmVudC5GaWx0ZXJzRGlkQ2hhbmdlLCB0aGlzLl9kYXRhR3JpZEZpbHRlcnNEaWRDaGFuZ2Us IHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3RlZE5vZGVDaGFuZ2VkLCB0aGlzLl9kYXRhR3JpZE5v ZGVTZWxlY3RlZCwgdGhpcyk7CiAKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklk ZW50aWZpZXIgPSAic3RhcnRUaW1lIjsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVt bklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJsYXlvdXQtdGlt ZWxpbmUtdmlldy1zb3J0IiwgInN0YXJ0VGltZSIpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5z b3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZzsKIAog ICAgICAgICB0aGlzLl9ob3ZlcmVkVHJlZUVsZW1lbnQgPSBudWxsOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0dyaWRDb250ZW50 Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdv cmtHcmlkQ29udGVudFZpZXcuanMKaW5kZXggMDhmZmI4ZjIzMjNjYmU2MDNkNjI4MzNjYmQ1OTg2 MjBlYzk0NTBlNy4uOTY3MmU2ODE4ODc2YWMzMGEzNjY4MWM3MzI2NzE0MWE0YTViYTMwMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29y a0dyaWRDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzCkBAIC04Miw3ICs4Miw3IEBAIFdl Ykluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya0dyaWRDb250 ZW50VmlldyBleHRlbmRzIFdlYkluCiAKICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQodGhpcy5fY29udGVudFRyZWVPdXRsaW5lLCBjb2x1 bW5zKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fZGF0YUdyaWROb2Rl U2VsZWN0ZWQsIHRoaXMpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRp ZmllciA9ICJyZXF1ZXN0U2VudCI7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5J ZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygibmV0d29yay1ncmlk LWNvbnRlbnQtdmlldy1zb3J0IiwgInJlcXVlc3RTZW50Iik7CiAgICAgICAgIHRoaXMuX2RhdGFH cmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5kaW5n OwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJuZXR3b3JrLWdyaWQiKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05l dHdvcmtUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzCmluZGV4IGEwMTg3ZWE1N2UwZmY3OTYzYzI4 NmIyZWUyODdiYjk3MmZjMjliYTIuLmIzNzVhNWIzZjU1ZTdlYjc1OThhN2JkYWI5NjYxYmMxMWQx MjQ2MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qcwpAQCAtODksNyArODksNyBA QCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldyA9IGNsYXNzIE5ldHdvcmtUaW1lbGlu ZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBX ZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZCh0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91 dGxpbmUsIGNvbHVtbnMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLkV2ZW50LkZpbHRlcnNEaWRDaGFuZ2UsIHRo aXMuX2RhdGFHcmlkRmlsdGVyc0RpZENoYW5nZSwgdGhpcyk7CiAgICAgICAgIHRoaXMuX2RhdGFH cmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNlbGVjdGVk Tm9kZUNoYW5nZWQsIHRoaXMuX2RhdGFHcmlkTm9kZVNlbGVjdGVkLCB0aGlzKTsKLSAgICAgICAg dGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXIgPSAicmVxdWVzdFNlbnQiOworICAg ICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBuZXcgV2Vi SW5zcGVjdG9yLlNldHRpbmcoIm5ldHdvcmstdGltZWxpbmUtdmlldy1zb3J0IiwgInJlcXVlc3RT ZW50Iik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5E YXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5kaW5nOwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFz c0xpc3QuYWRkKCJuZXR3b3JrIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxp bmVWaWV3LmpzCmluZGV4IDYxN2M1OWQ0NjYxNTlmYjU0YmE0ZTNmNDFmNmIxOGIxZTExNGM4ZTMu LmYxMTcwZjFkYmIxZmJiOWVlM2U1ZTM2NDAxY2RhMGRmODQ2YWZhMzAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGlt ZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3LmpzCkBAIC03NSw3ICs3NSw3IEBAIFdlYklu c3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldyA9IGNsYXNzIFJlbmRlcmluZ0ZyYW1l VGltZWxpbmVWaWV3IGV4dGVuCiAKICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5z cGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQodGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5l LCBjb2x1bW5zLCB0aGlzKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5f ZGF0YUdyaWROb2RlU2VsZWN0ZWQsIHRoaXMpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0 Q29sdW1uSWRlbnRpZmllciA9ICJzdGFydFRpbWUiOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5z b3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoInJl bmRlcmluZy1mcmFtZS10aW1lbGluZS12aWV3LXNvcnQiLCAic3RhcnRUaW1lIik7CiAgICAgICAg IHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3Jk ZXIuQXNjZW5kaW5nOwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJyZW5k ZXJpbmctZnJhbWUiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qcwppbmRleCAwMzU3OTc4 ZTBmYTAxMWYwYzM1ZDUzNmJkZjIzYTEyMmE1ZjE1NDU0Li5kMzhiZDFmYTZjYWJiM2EyNThlNzBj NTA0YzZiYThiN2IwNDg4YTljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVWaWV3LmpzCkBAIC02 NCw3ICs2NCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVZpZXcgPSBjbGFzcyBTY3Jp cHRUaW1lbGluZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuCiAgICAgICAgIHRoaXMuX2RhdGFH cmlkID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZURhdGFHcmlkKHRoaXMubmF2aWdh dGlvblNpZGViYXJUcmVlT3V0bGluZSwgY29sdW1ucywgdGhpcyk7CiAgICAgICAgIHRoaXMuX2Rh dGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQuRXZl bnQuRmlsdGVyc0RpZENoYW5nZSwgdGhpcy5fZGF0YUdyaWRGaWx0ZXJzRGlkQ2hhbmdlLCB0aGlz KTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu RGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fZGF0YUdyaWROb2RlU2Vs ZWN0ZWQsIHRoaXMpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmll ciA9ICJzdGFydFRpbWUiOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRp ZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoInNjcmlwdC10aW1lbGluZS12 aWV3LXNvcnQiLCAic3RhcnRUaW1lIik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRl ciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5kaW5nOwogCiAgICAgICAg IHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJzY3JpcHQiKTsK 268251 2016-01-04 17:11:20 -0800 2016-01-04 21:36:48 -0800 Patch 152626.diff text/plain 14206 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJjZmM3MjkuLmUyNWIwOTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUwIEBACiAyMDE2LTAxLTA0ICBEZXZpbiBSb3Vzc28g IDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFRp bWVsaW5lcyB2aWV3IGRvZXNuJ3QgcmVtZW1iZXIgaG93IEkgbGlrZSB0byBzb3J0IHRoaW5ncwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNjI2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5 LCBhbGwgaW5zdGFuY2VzIG9mIERhdGFHcmlkIGhhdmUgdGhlaXIgc29ydCBjb2x1bW4gcmVzZXQg d2l0aCBlYWNoCisgICAgICAgIG9wZW4vY2xvc2Ugb2YgV2ViIEluc3BlY3Rvci4gVGhpcyBkb2Vz bid0IHJlYWxseSBtYWtlIHNlbnNlIHNlZWluZyBhcyB3ZSBzYXZlCisgICAgICAgIHRoZSB1c2Vy J3Mgc2V0dGluZ3MgaW4gbWFueSBvdGhlciBjYXNlcywgc28gdGhlIHNvcnQgbWV0aG9kICh3aGlj aCBjb2x1bW4pCisgICAgICAgIHNob3VsZCBiZSBzYXZlZCBiZXR3ZWVuIGluc3BlY3RvciBzZXNz aW9ucy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNoZUZy YW1lQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNo ZUZyYW1lQ29udGVudFZpZXcucHJvdG90eXBlLl9jcmVhdGVEYXRhR3JpZCk6CisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fcmVidWls ZFRhYmxlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50 Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVudFZpZXcpOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRGF0YUdyaWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3Rv dHlwZS5zZXQgc29ydENvbHVtbklkZW50aWZpZXIpOgorICAgICAgICBNb3ZlZCB0aGUgbG9naWMg Zm9yIGNsYXNzTGlzdHMgYW5kIGV2ZW50cyB0byBfdXBkYXRlU29ydGVkQ29sdW1uLgorCisgICAg ICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLnNldCBzb3J0Q29sdW1uSWRlbnRp ZmllclNldHRpbmcpOgorICAgICAgICBJbnN0ZWFkIG9mIGp1c3Qgc2V0dGluZyB0aGUgb3JpZ2lu YWwgc29ydCBtZXRob2Qgd2hlbiBpbnN0YW50aWF0aW5nIHRoZSBEYXRhR3JpZCwKKyAgICAgICAg YSBXZWJJbnNwZWN0b3IuU2V0dGluZyBvYmplY3QgaXMgbm93IGFibGUgdG8gYmUgcGFzc2VkIGlu IHZpYSB0aGlzIHNldHRlcgorICAgICAgICB0byBnaXZlIHRoZSBEYXRhR3JpZCBhY2Nlc3MgdG8g dGhlIHN0b3JlZCBzb3J0IG1ldGhvZCB2YWx1ZS4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLkRh dGFHcmlkLnByb3RvdHlwZS5fdXBkYXRlU29ydGVkQ29sdW1uKToKKyAgICAgICAgVXBkYXRlcyB0 aGUgY2xhc3NMaXN0cyBhbmQgZmlyZXMgZXZlbnRzLiBJZiBhIHNvcnQgY29sdW1uIHNldHRpbmcg b2JqZWN0CisgICAgICAgIGV4aXN0cywgdXBkYXRlIGl0cyB2YWx1ZS4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5f YnVpbGREYXRhR3JpZFNlY3Rpb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5 b3V0VGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5l Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRW aWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcpOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3KToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3KToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TY3JpcHRUaW1lbGluZVZpZXcpOgorCisyMDE2LTAxLTA0ICBEZXZpbiBSb3Vzc28gIDxk Y3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFkZCBj b250ZXh0IG1lbnUgaXRlbXMgdG8gQ1NTIHNlbGVjdG9ycyB0byBhdXRvLWdlbmVyYXRlIHBzZXVk byBzZWxlY3RvcnMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1MjY1NwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZUNv bnRlbnRWaWV3LmpzCmluZGV4IGE2ZWU0MmIuLjljOGMxOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZUNv bnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3LmpzCkBAIC0xNjIsNyArMTYyLDcg QEAgV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3ID0gY2xhc3Mg QXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGUKICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcg V2ViSW5zcGVjdG9yLkRhdGFHcmlkKGNvbHVtbnMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5Tb3J0Q2hhbmdlZCwg dGhpcy5fc29ydERhdGFHcmlkLCB0aGlzKTsKIAotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0 Q29sdW1uSWRlbnRpZmllciA9ICJ1cmwiOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29s dW1uSWRlbnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoImFwcGxpY2F0 aW9uLWNhY2hlLWZyYW1lLWNvbnRlbnQtdmlldy1zb3J0IiwgInVybCIpOwogICAgICAgICB0aGlz Ll9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFz Y2VuZGluZzsKIAogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fZGF0YUdyaWQpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2ll U3RvcmFnZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzCmluZGV4IDM3NDhlYjcuLjExNWY5 Yzc2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5qcwpAQCAtMTQy LDcgKzE0Miw3IEBAIFdlYkluc3BlY3Rvci5Db29raWVTdG9yYWdlQ29udGVudFZpZXcgPSBjbGFz cyBDb29raWVTdG9yYWdlQ29udGVudFZpZXcgZXh0ZW5kcyBXCiAgICAgICAgICAgICB0aGlzLl9k YXRhR3JpZC5hcHBlbmRDaGlsZChub2RlKTsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX2Rh dGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyID0gIm5hbWUiOworICAgICAgICB0aGlzLl9kYXRh R3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRp bmcoImNvb2tpZS1zdG9yYWdlLWNvbnRlbnQtdmlldy1zb3J0IiwgIm5hbWUiKTsKICAgICB9CiAK ICAgICBfZmlsdGVyQ29va2llcyhjb29raWVzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRW aWV3LmpzCmluZGV4IDkyZjNkNzEuLjJhMjUwZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29u dGVudFZpZXcuanMKQEAgLTQzLDcgKzQzLDcgQEAgV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250 ZW50VmlldyA9IGNsYXNzIERPTVN0b3JhZ2VDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3AKIAog ICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1u cywgdGhpcy5fZWRpdGluZ0NhbGxiYWNrLmJpbmQodGhpcyksIHRoaXMuX2RlbGV0ZUNhbGxiYWNr LmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJbnNw ZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZzsKLSAgICAgICAgdGhpcy5fZGF0YUdy aWQuc29ydENvbHVtbklkZW50aWZpZXIgPSAia2V5IjsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQu c29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJk b20tc3RvcmFnZS1jb250ZW50LXZpZXctc29ydCIsICJrZXkiKTsKICAgICAgICAgdGhpcy5fZGF0 YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU29ydENo YW5nZWQsIHRoaXMuX3NvcnREYXRhR3JpZCwgdGhpcyk7CiAKICAgICAgICAgdGhpcy5hZGRTdWJ2 aWV3KHRoaXMuX2RhdGFHcmlkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanMKaW5kZXggODFmZmI3Ny4uNTEwYTVjMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdy aWQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0 YUdyaWQuanMKQEAgLTMzLDYgKzMzLDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkID0gY2xhc3Mg RGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0aGlzLm9yZGVyZWRD b2x1bW5zID0gW107CiAKICAgICAgICAgdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXIgPSBudWxs OworICAgICAgICB0aGlzLl9zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBudWxsOwogICAg ICAgICB0aGlzLl9zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLklu ZGV0ZXJtaW5hdGU7CiAKICAgICAgICAgdGhpcy5jaGlsZHJlbiA9IFtdOwpAQCAtMjA4LDE3ICsy MDksMzMgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBX ZWJJbnNwZWN0b3IuVmlldwogICAgICAgICBpZiAodGhpcy5fc29ydENvbHVtbklkZW50aWZpZXIg PT09IGNvbHVtbklkZW50aWZpZXIpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdmFy IG9sZFNvcnRDb2x1bW5JZGVudGlmaWVyID0gdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXI7Cisg ICAgICAgIGxldCBvbGRTb3J0Q29sdW1uSWRlbnRpZmllciA9IHRoaXMuX3NvcnRDb2x1bW5JZGVu dGlmaWVyOwogICAgICAgICB0aGlzLl9zb3J0Q29sdW1uSWRlbnRpZmllciA9IGNvbHVtbklkZW50 aWZpZXI7CisgICAgICAgIHRoaXMuX3VwZGF0ZVNvcnRlZENvbHVtbihvbGRTb3J0Q29sdW1uSWRl bnRpZmllcik7CisgICAgfQorCisgICAgc2V0IHNvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyhz ZXR0aW5nKQorICAgIHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQoc2V0dGluZyBpbnN0YW5jZW9m IFdlYkluc3BlY3Rvci5TZXR0aW5nKTsKKworICAgICAgICB0aGlzLl9zb3J0Q29sdW1uSWRlbnRp ZmllclNldHRpbmcgPSBzZXR0aW5nOworICAgICAgICBpZiAodGhpcy5fc29ydENvbHVtbklkZW50 aWZpZXJTZXR0aW5nLnZhbHVlKQorICAgICAgICAgICAgdGhpcy5zb3J0Q29sdW1uSWRlbnRpZmll ciA9IHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZy52YWx1ZTsKKyAgICB9CisKKyAg ICBfdXBkYXRlU29ydGVkQ29sdW1uKG9sZFNvcnRDb2x1bW5JZGVudGlmaWVyKQorICAgIHsKKyAg ICAgICAgaWYgKHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZykKKyAgICAgICAgICAg IHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZy52YWx1ZSA9IHRoaXMuX3NvcnRDb2x1 bW5JZGVudGlmaWVyOwogCiAgICAgICAgIGlmIChvbGRTb3J0Q29sdW1uSWRlbnRpZmllcikgewot ICAgICAgICAgICAgdmFyIG9sZFNvcnRIZWFkZXJDZWxsRWxlbWVudCA9IHRoaXMuX2hlYWRlclRh YmxlQ2VsbEVsZW1lbnRzLmdldChvbGRTb3J0Q29sdW1uSWRlbnRpZmllcik7CisgICAgICAgICAg ICBsZXQgb2xkU29ydEhlYWRlckNlbGxFbGVtZW50ID0gdGhpcy5faGVhZGVyVGFibGVDZWxsRWxl bWVudHMuZ2V0KG9sZFNvcnRDb2x1bW5JZGVudGlmaWVyKTsKICAgICAgICAgICAgIG9sZFNvcnRI ZWFkZXJDZWxsRWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5T b3J0Q29sdW1uQXNjZW5kaW5nU3R5bGVDbGFzc05hbWUpOwogICAgICAgICAgICAgb2xkU29ydEhl YWRlckNlbGxFbGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNv cnRDb2x1bW5EZXNjZW5kaW5nU3R5bGVDbGFzc05hbWUpOwogICAgICAgICB9CiAKLSAgICAgICAg aWYgKHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyKSB7Ci0gICAgICAgICAgICB2YXIgbmV3U29y dEhlYWRlckNlbGxFbGVtZW50ID0gdGhpcy5faGVhZGVyVGFibGVDZWxsRWxlbWVudHMuZ2V0KHRo aXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyKTsKKyAgICAgICAgaWYgKHRoaXMuc29ydENvbHVtbklk ZW50aWZpZXIpIHsKKyAgICAgICAgICAgIGxldCBuZXdTb3J0SGVhZGVyQ2VsbEVsZW1lbnQgPSB0 aGlzLl9oZWFkZXJUYWJsZUNlbGxFbGVtZW50cy5nZXQodGhpcy5zb3J0Q29sdW1uSWRlbnRpZmll cik7CiAgICAgICAgICAgICBuZXdTb3J0SGVhZGVyQ2VsbEVsZW1lbnQuY2xhc3NMaXN0LnRvZ2ds ZShXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydENvbHVtbkFzY2VuZGluZ1N0eWxlQ2xhc3NOYW1l LCB0aGlzLl9zb3J0T3JkZXIgPT09IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuQXNj ZW5kaW5nKTsKICAgICAgICAgICAgIG5ld1NvcnRIZWFkZXJDZWxsRWxlbWVudC5jbGFzc0xpc3Qu dG9nZ2xlKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0Q29sdW1uRGVzY2VuZGluZ1N0eWxlQ2xh c3NOYW1lLCB0aGlzLl9zb3J0T3JkZXIgPT09IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3Jk ZXIuRGVzY2VuZGluZyk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRh aWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IDIyNmJhYzcuLjNhOWUwZmMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURldGFpbHNT aWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtMTQxLDcgKzE0MSw3IEBA IFdlYkluc3BlY3Rvci5MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgTGF5ZXJU cmVlRGV0YWlsc1NpZGViYXJQYW5lbCBlCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNvcnRDaGFuZ2VkLCB0aGlzLl9z b3J0RGF0YUdyaWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3RlZE5vZGVDaGFuZ2VkLCB0aGlz Ll9zZWxlY3RlZERhdGFHcmlkTm9kZUNoYW5nZWQsIHRoaXMpOwogCi0gICAgICAgIHRoaXMuc29y dENvbHVtbklkZW50aWZpZXIgPSAibWVtb3J5IjsKKyAgICAgICAgdGhpcy5zb3J0Q29sdW1uSWRl bnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoImxheWVyLXRyZWUtZGV0 YWlscy1zaWRlYmFyLXBhbmVsLXNvcnQiLCAibWVtb3J5Iik7CiAgICAgICAgIHRoaXMuc29ydE9y ZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5EZXNjZW5kaW5nOwogCiAgICAg ICAgIHZhciBlbGVtZW50ID0gdGhpcy5fZGF0YUdyaWQuZWxlbWVudDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lVmll dy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRp bWVsaW5lVmlldy5qcwppbmRleCBjYTQ1YWQ5Li5hMjI4MDUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZVZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGlt ZWxpbmVWaWV3LmpzCkBAIC03Miw3ICs3Miw3IEBAIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGlu ZVZpZXcgPSBjbGFzcyBMYXlvdXRUaW1lbGluZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuCiAg ICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVs aW5lRGF0YUdyaWQuRXZlbnQuRmlsdGVyc0RpZENoYW5nZSwgdGhpcy5fZGF0YUdyaWRGaWx0ZXJz RGlkQ2hhbmdlLCB0aGlzKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5f ZGF0YUdyaWROb2RlU2VsZWN0ZWQsIHRoaXMpOwogCi0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNv cnRDb2x1bW5JZGVudGlmaWVyID0gInN0YXJ0VGltZSI7CisgICAgICAgIHRoaXMuX2RhdGFHcmlk LnNvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygi bGF5b3V0LXRpbWVsaW5lLXZpZXctc29ydCIsICJzdGFydFRpbWUiKTsKICAgICAgICAgdGhpcy5f ZGF0YUdyaWQuc29ydE9yZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2Nl bmRpbmc7CiAKICAgICAgICAgdGhpcy5faG92ZXJlZFRyZWVFbGVtZW50ID0gbnVsbDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtH cmlkQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzCmluZGV4IDA4ZmZiOGYuLjk2NzJlNjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdv cmtHcmlkQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTmV0d29ya0dyaWRDb250ZW50Vmlldy5qcwpAQCAtODIsNyArODIsNyBAQCBX ZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtHcmlkQ29u dGVudFZpZXcgZXh0ZW5kcyBXZWJJbgogCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdl Ykluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkKHRoaXMuX2NvbnRlbnRUcmVlT3V0bGluZSwgY29s dW1ucyk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLkRhdGFHcmlkLkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5nZWQsIHRoaXMuX2RhdGFHcmlkTm9k ZVNlbGVjdGVkLCB0aGlzKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50 aWZpZXIgPSAicmVxdWVzdFNlbnQiOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1u SWRlbnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoIm5ldHdvcmstZ3Jp ZC1jb250ZW50LXZpZXctc29ydCIsICJyZXF1ZXN0U2VudCIpOwogICAgICAgICB0aGlzLl9kYXRh R3JpZC5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGlu ZzsKIAogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibmV0d29yay1ncmlkIik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9O ZXR3b3JrVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qcwppbmRleCBhMDE4N2VhLi5iMzc1YTViIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3 b3JrVGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMKQEAgLTg5LDcgKzg5LDcgQEAgV2ViSW5z cGVjdG9yLk5ldHdvcmtUaW1lbGluZVZpZXcgPSBjbGFzcyBOZXR3b3JrVGltZWxpbmVWaWV3IGV4 dGVuZHMgV2ViSW5zcGVjdG8KICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVj dG9yLlRpbWVsaW5lRGF0YUdyaWQodGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLCBj b2x1bW5zKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuVGltZWxpbmVEYXRhR3JpZC5FdmVudC5GaWx0ZXJzRGlkQ2hhbmdlLCB0aGlzLl9kYXRh R3JpZEZpbHRlcnNEaWRDaGFuZ2UsIHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3RlZE5vZGVDaGFu Z2VkLCB0aGlzLl9kYXRhR3JpZE5vZGVTZWxlY3RlZCwgdGhpcyk7Ci0gICAgICAgIHRoaXMuX2Rh dGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyID0gInJlcXVlc3RTZW50IjsKKyAgICAgICAgdGhp cy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rv ci5TZXR0aW5nKCJuZXR3b3JrLXRpbWVsaW5lLXZpZXctc29ydCIsICJyZXF1ZXN0U2VudCIpOwog ICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQu U29ydE9yZGVyLkFzY2VuZGluZzsKIAogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFk ZCgibmV0d29yayIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5q cwppbmRleCA2MTdjNTlkLi5mMTE3MGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFt ZVRpbWVsaW5lVmlldy5qcwpAQCAtNzUsNyArNzUsNyBAQCBXZWJJbnNwZWN0b3IuUmVuZGVyaW5n RnJhbWVUaW1lbGluZVZpZXcgPSBjbGFzcyBSZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldyBleHRl bgogCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZURh dGFHcmlkKHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZSwgY29sdW1ucywgdGhpcyk7 CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRh dGFHcmlkLkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5nZWQsIHRoaXMuX2RhdGFHcmlkTm9kZVNlbGVj dGVkLCB0aGlzKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXIg PSAic3RhcnRUaW1lIjsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZp ZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJyZW5kZXJpbmctZnJhbWUtdGlt ZWxpbmUtdmlldy1zb3J0IiwgInN0YXJ0VGltZSIpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5z b3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZzsKIAog ICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgicmVuZGVyaW5nLWZyYW1lIik7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3Jp cHRUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TY3JpcHRUaW1lbGluZVZpZXcuanMKaW5kZXggMDM1Nzk3OC4uZDM4YmQxZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGlt ZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qcwpAQCAtNjQsNyArNjQsNyBAQCBXZWJJbnNwZWN0b3Iu U2NyaXB0VGltZWxpbmVWaWV3ID0gY2xhc3MgU2NyaXB0VGltZWxpbmVWaWV3IGV4dGVuZHMgV2Vi SW5zcGVjdG9yLgogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuU2Ny aXB0VGltZWxpbmVEYXRhR3JpZCh0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUsIGNv bHVtbnMsIHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLkV2ZW50LkZpbHRlcnNEaWRDaGFuZ2UsIHRoaXMu X2RhdGFHcmlkRmlsdGVyc0RpZENoYW5nZSwgdGhpcyk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlk LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNlbGVjdGVkTm9k ZUNoYW5nZWQsIHRoaXMuX2RhdGFHcmlkTm9kZVNlbGVjdGVkLCB0aGlzKTsKLSAgICAgICAgdGhp cy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXIgPSAic3RhcnRUaW1lIjsKKyAgICAgICAg dGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3Bl Y3Rvci5TZXR0aW5nKCJzY3JpcHQtdGltZWxpbmUtdmlldy1zb3J0IiwgInN0YXJ0VGltZSIpOwog ICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQu U29ydE9yZGVyLkFzY2VuZGluZzsKIAogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFk ZCgic2NyaXB0Iik7Cg== 268267 2016-01-04 21:36:48 -0800 2016-01-04 22:36:00 -0800 Patch 152626.diff text/plain 14100 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDJmYjZkNjcuLmE0ODJkODQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDE2LTAxLTA0ICBEZXZpbiBSb3Vzc28g IDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFRp bWVsaW5lcyB2aWV3IGRvZXNuJ3QgcmVtZW1iZXIgaG93IEkgbGlrZSB0byBzb3J0IHRoaW5ncwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNjI2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAgICAgIEN1cnJlbnRs eSwgYWxsIGluc3RhbmNlcyBvZiBEYXRhR3JpZCBoYXZlIHRoZWlyIHNvcnQgY29sdW1uIHJlc2V0 IHdpdGggZWFjaAorICAgICAgICBvcGVuL2Nsb3NlIG9mIFdlYiBJbnNwZWN0b3IuIFRoaXMgZG9l c24ndCByZWFsbHkgbWFrZSBzZW5zZSBzZWVpbmcgYXMgd2Ugc2F2ZQorICAgICAgICB0aGUgdXNl cidzIHNldHRpbmdzIGluIG1hbnkgb3RoZXIgY2FzZXMsIHNvIHRoZSBzb3J0IG1ldGhvZCAod2hp Y2ggY29sdW1uKQorICAgICAgICBzaG91bGQgYmUgc2F2ZWQgYmV0d2VlbiBpbnNwZWN0b3Igc2Vz c2lvbnMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVG cmFtZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2Fj aGVGcmFtZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlRGF0YUdyaWQpOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUuX3JlYnVp bGRUYWJsZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29udGVu dFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3KToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRhdGFHcmlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90 b3R5cGUuc2V0IHNvcnRDb2x1bW5JZGVudGlmaWVyKToKKyAgICAgICAgTW92ZWQgdGhlIGxvZ2lj IGZvciBjbGFzc0xpc3RzIGFuZCBldmVudHMgdG8gX3VwZGF0ZVNvcnRlZENvbHVtbi4KKworICAg ICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5zZXQgc29ydENvbHVtbklkZW50 aWZpZXJTZXR0aW5nKToKKyAgICAgICAgSW5zdGVhZCBvZiBqdXN0IHNldHRpbmcgdGhlIG9yaWdp bmFsIHNvcnQgbWV0aG9kIHdoZW4gaW5zdGFudGlhdGluZyB0aGUgRGF0YUdyaWQsCisgICAgICAg IGEgV2ViSW5zcGVjdG9yLlNldHRpbmcgb2JqZWN0IGlzIG5vdyBhYmxlIHRvIGJlIHBhc3NlZCBp biB2aWEgdGhpcyBzZXR0ZXIKKyAgICAgICAgdG8gZ2l2ZSB0aGUgRGF0YUdyaWQgYWNjZXNzIHRv IHRoZSBzdG9yZWQgc29ydCBtZXRob2QgdmFsdWUuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E YXRhR3JpZC5wcm90b3R5cGUuX3VwZGF0ZVNvcnRlZENvbHVtbik6CisgICAgICAgIFVwZGF0ZXMg dGhlIGNsYXNzTGlzdHMgYW5kIGZpcmVzIGV2ZW50cy4gSWYgYSBzb3J0IGNvbHVtbiBzZXR0aW5n IG9iamVjdAorICAgICAgICBleGlzdHMsIHVwZGF0ZSBpdHMgdmFsdWUuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUu X2J1aWxkRGF0YUdyaWRTZWN0aW9uKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xh eW91dFRpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGlu ZVZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0dyaWRDb250ZW50 Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3KToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldyk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldyk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3KToKKwogMjAxNi0wMS0wNCAgSm9zZXBoIFBlY29yYXJv ICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEZpeCBkZWJ1 ZyBjb250ZXh0IG1lbnUgc3RyaW5nIGFuZCByZWxvYWQgd2l0aG91dCBjYWNoZSB0b29sdGlwIHN0 cmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmll dy5qcwppbmRleCBhNmVlNDJiLi45YzhjMThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBs aWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmlldy5qcwpAQCAtMTYyLDcgKzE2Miw3IEBAIFdlYklu c3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50VmlldyA9IGNsYXNzIEFwcGxpY2F0 aW9uQ2FjaGVGcmFtZUNvbnRlCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYkluc3Bl Y3Rvci5EYXRhR3JpZChjb2x1bW5zKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU29ydENoYW5nZWQsIHRoaXMuX3Nv cnREYXRhR3JpZCwgdGhpcyk7CiAKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklk ZW50aWZpZXIgPSAidXJsIjsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50 aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJhcHBsaWNhdGlvbi1jYWNo ZS1mcmFtZS1jb250ZW50LXZpZXctc29ydCIsICJ1cmwiKTsKICAgICAgICAgdGhpcy5fZGF0YUdy aWQuc29ydE9yZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmc7 CiAKICAgICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2RhdGFHcmlkKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tpZVN0b3JhZ2VD b250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0Nvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5qcwppbmRleCAzNzQ4ZWI3Li4xMTVmOWM3NmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tp ZVN0b3JhZ2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcuanMKQEAgLTE0Miw3ICsxNDIs NyBAQCBXZWJJbnNwZWN0b3IuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3ID0gY2xhc3MgQ29va2ll U3RvcmFnZUNvbnRlbnRWaWV3IGV4dGVuZHMgVwogICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQu YXBwZW5kQ2hpbGQobm9kZSk7CiAgICAgICAgIH0KIAotICAgICAgICB0aGlzLl9kYXRhR3JpZC5z b3J0Q29sdW1uSWRlbnRpZmllciA9ICJuYW1lIjsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29y dENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJjb29r aWUtc3RvcmFnZS1jb250ZW50LXZpZXctc29ydCIsICJuYW1lIik7CiAgICAgfQogCiAgICAgX2Zp bHRlckNvb2tpZXMoY29va2llcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5qcwpp bmRleCA5MmYzZDcxLi4yYTI1MGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3 LmpzCkBAIC00Myw3ICs0Myw3IEBAIFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVudFZpZXcg PSBjbGFzcyBET01TdG9yYWdlQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwCiAKICAgICAgICAg dGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlkKGNvbHVtbnMsIHRoaXMu X2VkaXRpbmdDYWxsYmFjay5iaW5kKHRoaXMpLCB0aGlzLl9kZWxldGVDYWxsYmFjay5iaW5kKHRo aXMpKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyID0gV2ViSW5zcGVjdG9yLkRh dGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmc7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRD b2x1bW5JZGVudGlmaWVyID0gImtleSI7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1 bW5JZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygiZG9tLXN0b3Jh Z2UtY29udGVudC12aWV3LXNvcnQiLCAia2V5Iik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFk ZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNvcnRDaGFuZ2VkLCB0 aGlzLl9zb3J0RGF0YUdyaWQsIHRoaXMpOwogCiAgICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlz Ll9kYXRhR3JpZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9EYXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RhdGFHcmlkLmpzCmluZGV4IDgxZmZiNzcuLjVmNjc0YTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpz CkBAIC0zMyw2ICszMyw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlk IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgdGhpcy5vcmRlcmVkQ29sdW1ucyA9 IFtdOwogCiAgICAgICAgIHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyID0gbnVsbDsKKyAgICAg ICAgdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbnVsbDsKICAgICAgICAgdGhp cy5fc29ydE9yZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5JbmRldGVybWlu YXRlOwogCiAgICAgICAgIHRoaXMuY2hpbGRyZW4gPSBbXTsKQEAgLTIwOCwxNyArMjA5LDMzIEBA IFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVj dG9yLlZpZXcKICAgICAgICAgaWYgKHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyID09PSBjb2x1 bW5JZGVudGlmaWVyKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBvbGRTb3J0 Q29sdW1uSWRlbnRpZmllciA9IHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyOworICAgICAgICBs ZXQgb2xkU29ydENvbHVtbklkZW50aWZpZXIgPSB0aGlzLl9zb3J0Q29sdW1uSWRlbnRpZmllcjsK ICAgICAgICAgdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXIgPSBjb2x1bW5JZGVudGlmaWVyOwor ICAgICAgICB0aGlzLl91cGRhdGVTb3J0ZWRDb2x1bW4ob2xkU29ydENvbHVtbklkZW50aWZpZXIp OworICAgIH0KKworICAgIHNldCBzb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcoc2V0dGluZykK KyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHNldHRpbmcgaW5zdGFuY2VvZiBXZWJJbnNw ZWN0b3IuU2V0dGluZyk7CisKKyAgICAgICAgdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXJTZXR0 aW5nID0gc2V0dGluZzsKKyAgICAgICAgaWYgKHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyU2V0 dGluZy52YWx1ZSkKKyAgICAgICAgICAgIHRoaXMuc29ydENvbHVtbklkZW50aWZpZXIgPSB0aGlz Ll9zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcudmFsdWU7CisgICAgfQorCisgICAgX3VwZGF0 ZVNvcnRlZENvbHVtbihvbGRTb3J0Q29sdW1uSWRlbnRpZmllcikKKyAgICB7CisgICAgICAgIGlm ICh0aGlzLl9zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcpCisgICAgICAgICAgICB0aGlzLl9z b3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcudmFsdWUgPSB0aGlzLl9zb3J0Q29sdW1uSWRlbnRp ZmllcjsKIAogICAgICAgICBpZiAob2xkU29ydENvbHVtbklkZW50aWZpZXIpIHsKLSAgICAgICAg ICAgIHZhciBvbGRTb3J0SGVhZGVyQ2VsbEVsZW1lbnQgPSB0aGlzLl9oZWFkZXJUYWJsZUNlbGxF bGVtZW50cy5nZXQob2xkU29ydENvbHVtbklkZW50aWZpZXIpOworICAgICAgICAgICAgbGV0IG9s ZFNvcnRIZWFkZXJDZWxsRWxlbWVudCA9IHRoaXMuX2hlYWRlclRhYmxlQ2VsbEVsZW1lbnRzLmdl dChvbGRTb3J0Q29sdW1uSWRlbnRpZmllcik7CiAgICAgICAgICAgICBvbGRTb3J0SGVhZGVyQ2Vs bEVsZW1lbnQuY2xhc3NMaXN0LnJlbW92ZShXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydENvbHVt bkFzY2VuZGluZ1N0eWxlQ2xhc3NOYW1lKTsKICAgICAgICAgICAgIG9sZFNvcnRIZWFkZXJDZWxs RWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0Q29sdW1u RGVzY2VuZGluZ1N0eWxlQ2xhc3NOYW1lKTsKICAgICAgICAgfQogCiAgICAgICAgIGlmICh0aGlz Ll9zb3J0Q29sdW1uSWRlbnRpZmllcikgewotICAgICAgICAgICAgdmFyIG5ld1NvcnRIZWFkZXJD ZWxsRWxlbWVudCA9IHRoaXMuX2hlYWRlclRhYmxlQ2VsbEVsZW1lbnRzLmdldCh0aGlzLl9zb3J0 Q29sdW1uSWRlbnRpZmllcik7CisgICAgICAgICAgICBsZXQgbmV3U29ydEhlYWRlckNlbGxFbGVt ZW50ID0gdGhpcy5faGVhZGVyVGFibGVDZWxsRWxlbWVudHMuZ2V0KHRoaXMuX3NvcnRDb2x1bW5J ZGVudGlmaWVyKTsKICAgICAgICAgICAgIG5ld1NvcnRIZWFkZXJDZWxsRWxlbWVudC5jbGFzc0xp c3QudG9nZ2xlKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0Q29sdW1uQXNjZW5kaW5nU3R5bGVD bGFzc05hbWUsIHRoaXMuX3NvcnRPcmRlciA9PT0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRP cmRlci5Bc2NlbmRpbmcpOwogICAgICAgICAgICAgbmV3U29ydEhlYWRlckNlbGxFbGVtZW50LmNs YXNzTGlzdC50b2dnbGUoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRDb2x1bW5EZXNjZW5kaW5n U3R5bGVDbGFzc05hbWUsIHRoaXMuX3NvcnRPcmRlciA9PT0gV2ViSW5zcGVjdG9yLkRhdGFHcmlk LlNvcnRPcmRlci5EZXNjZW5kaW5nKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQ YW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVy VHJlZURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggMjI2YmFjNy4uM2E5ZTBmYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVl RGV0YWlsc1NpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCkBAIC0xNDEsNyAr MTQxLDcgQEAgV2ViSW5zcGVjdG9yLkxheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFz cyBMYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsIGUKICAgICAgICAgdGhpcy5fZGF0YUdyaWQu YWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU29ydENoYW5nZWQs IHRoaXMuX3NvcnREYXRhR3JpZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5n ZWQsIHRoaXMuX3NlbGVjdGVkRGF0YUdyaWROb2RlQ2hhbmdlZCwgdGhpcyk7CiAKLSAgICAgICAg dGhpcy5zb3J0Q29sdW1uSWRlbnRpZmllciA9ICJtZW1vcnkiOworICAgICAgICB0aGlzLnNvcnRD b2x1bW5JZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygibGF5ZXIt dHJlZS1kZXRhaWxzLXNpZGViYXItcGFuZWwtc29ydCIsICJtZW1vcnkiKTsKICAgICAgICAgdGhp cy5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkRlc2NlbmRpbmc7 CiAKICAgICAgICAgdmFyIGVsZW1lbnQgPSB0aGlzLl9kYXRhR3JpZC5lbGVtZW50OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGlt ZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TGF5b3V0VGltZWxpbmVWaWV3LmpzCmluZGV4IGNhNDVhZDkuLmEyMjgwNTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5l Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9M YXlvdXRUaW1lbGluZVZpZXcuanMKQEAgLTcyLDcgKzcyLDcgQEAgV2ViSW5zcGVjdG9yLkxheW91 dFRpbWVsaW5lVmlldyA9IGNsYXNzIExheW91dFRpbWVsaW5lVmlldyBleHRlbmRzIFdlYkluc3Bl Y3Rvci4KICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuVGltZWxpbmVEYXRhR3JpZC5FdmVudC5GaWx0ZXJzRGlkQ2hhbmdlLCB0aGlzLl9kYXRhR3Jp ZEZpbHRlcnNEaWRDaGFuZ2UsIHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3RlZE5vZGVDaGFuZ2Vk LCB0aGlzLl9kYXRhR3JpZE5vZGVTZWxlY3RlZCwgdGhpcyk7CiAKLSAgICAgICAgdGhpcy5fZGF0 YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXIgPSAic3RhcnRUaW1lIjsKKyAgICAgICAgdGhpcy5f ZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5T ZXR0aW5nKCJsYXlvdXQtdGltZWxpbmUtdmlldy1zb3J0IiwgInN0YXJ0VGltZSIpOwogICAgICAg ICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9y ZGVyLkFzY2VuZGluZzsKIAogICAgICAgICB0aGlzLl9ob3ZlcmVkVHJlZUVsZW1lbnQgPSBudWxs OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmV0d29ya0dyaWRDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL05ldHdvcmtHcmlkQ29udGVudFZpZXcuanMKaW5kZXggMDhmZmI4Zi4uOTY3 MmU2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTmV0d29ya0dyaWRDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzCkBAIC04Miw3ICs4 Miw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29y a0dyaWRDb250ZW50VmlldyBleHRlbmRzIFdlYkluCiAKICAgICAgICAgdGhpcy5fZGF0YUdyaWQg PSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQodGhpcy5fY29udGVudFRyZWVPdXRs aW5lLCBjb2x1bW5zKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fZGF0 YUdyaWROb2RlU2VsZWN0ZWQsIHRoaXMpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29s dW1uSWRlbnRpZmllciA9ICJyZXF1ZXN0U2VudCI7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNv cnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygibmV0 d29yay1ncmlkLWNvbnRlbnQtdmlldy1zb3J0IiwgInJlcXVlc3RTZW50Iik7CiAgICAgICAgIHRo aXMuX2RhdGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIu QXNjZW5kaW5nOwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJuZXR3b3Jr LWdyaWQiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzCmluZGV4IGEwMTg3ZWEuLmIz NzVhNWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qcwpAQCAtODksNyArODksNyBA QCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldyA9IGNsYXNzIE5ldHdvcmtUaW1lbGlu ZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBX ZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZCh0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91 dGxpbmUsIGNvbHVtbnMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLkV2ZW50LkZpbHRlcnNEaWRDaGFuZ2UsIHRo aXMuX2RhdGFHcmlkRmlsdGVyc0RpZENoYW5nZSwgdGhpcyk7CiAgICAgICAgIHRoaXMuX2RhdGFH cmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNlbGVjdGVk Tm9kZUNoYW5nZWQsIHRoaXMuX2RhdGFHcmlkTm9kZVNlbGVjdGVkLCB0aGlzKTsKLSAgICAgICAg dGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXIgPSAicmVxdWVzdFNlbnQiOworICAg ICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBuZXcgV2Vi SW5zcGVjdG9yLlNldHRpbmcoIm5ldHdvcmstdGltZWxpbmUtdmlldy1zb3J0IiwgInJlcXVlc3RT ZW50Iik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5E YXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5kaW5nOwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFz c0xpc3QuYWRkKCJuZXR3b3JrIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxp bmVWaWV3LmpzCmluZGV4IDYxN2M1OWQuLmYxMTcwZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRl cmluZ0ZyYW1lVGltZWxpbmVWaWV3LmpzCkBAIC03NSw3ICs3NSw3IEBAIFdlYkluc3BlY3Rvci5S ZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldyA9IGNsYXNzIFJlbmRlcmluZ0ZyYW1lVGltZWxpbmVW aWV3IGV4dGVuCiAKICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLlRp bWVsaW5lRGF0YUdyaWQodGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLCBjb2x1bW5z LCB0aGlzKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fZGF0YUdyaWRO b2RlU2VsZWN0ZWQsIHRoaXMpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRl bnRpZmllciA9ICJzdGFydFRpbWUiOworICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1u SWRlbnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoInJlbmRlcmluZy1m cmFtZS10aW1lbGluZS12aWV3LXNvcnQiLCAic3RhcnRUaW1lIik7CiAgICAgICAgIHRoaXMuX2Rh dGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5k aW5nOwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJyZW5kZXJpbmctZnJh bWUiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qcwppbmRleCAwMzU3OTc4Li5kMzhiZDFm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T Y3JpcHRUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVWaWV3LmpzCkBAIC02NCw3ICs2NCw3IEBAIFdlYklu c3BlY3Rvci5TY3JpcHRUaW1lbGluZVZpZXcgPSBjbGFzcyBTY3JpcHRUaW1lbGluZVZpZXcgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYkluc3Bl Y3Rvci5TY3JpcHRUaW1lbGluZURhdGFHcmlkKHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0 bGluZSwgY29sdW1ucywgdGhpcyk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQuRXZlbnQuRmlsdGVyc0RpZENoYW5n ZSwgdGhpcy5fZGF0YUdyaWRGaWx0ZXJzRGlkQ2hhbmdlLCB0aGlzKTsKICAgICAgICAgdGhpcy5f ZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU2Vs ZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fZGF0YUdyaWROb2RlU2VsZWN0ZWQsIHRoaXMpOwotICAg ICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllciA9ICJzdGFydFRpbWUiOwor ICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBuZXcg V2ViSW5zcGVjdG9yLlNldHRpbmcoInNjcmlwdC10aW1lbGluZS12aWV3LXNvcnQiLCAic3RhcnRU aW1lIik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5E YXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5kaW5nOwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFz c0xpc3QuYWRkKCJzY3JpcHQiKTsK