141397 2015-02-09 13:03:35 -0800 Web Inspector: Inspecting a page where resources are in folders forces folder organization on every subsequent page 2022-03-01 02:48:06 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 jonowells jonowells graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1067887 0 jonowells 2015-02-09 13:03:35 -0800 Normally opening the inspector on a page with few resources will avoid putting those resources into folders (Stylesheets, Scripts, etc). Pages with many resources will have their resources organized by folder when inspected. However once the inspector uses folders for resources, navigating to any other page, even one with few resources, will folderize the resources even though it shouldn't. 1067888 1 webkit-bug-importer 2015-02-09 13:03:50 -0800 <rdar://problem/19770326> 1067889 2 jonowells 2015-02-09 13:05:37 -0800 Offline diagnosis from Joe Peck: FrameTreeElement.prototype._mainResourceDidChange should flip this._groupedIntoFolders in FolderizedTreeElement.js 1067905 3 246288 jonowells 2015-02-09 14:21:11 -0800 Created attachment 246288 [PATCH] Fix. 1067911 4 246288 joepeck 2015-02-09 14:31:39 -0800 Comment on attachment 246288 [PATCH] Fix. View in context: https://bugs.webkit.org/attachment.cgi?id=246288&action=review > Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js:291 > + this._groupedIntoFolders = false; We don't want to reach into the superclass' member variables here. Actually, now that I see this code, it seems "FolderizedTreeElement.prototype.removeChildren" would be appropriate to reset this flag. removeChildren is called here, and if that really does take us to 0 children, it should reset this state. 1067933 5 jonowells 2015-02-09 15:22:50 -0800 (In reply to comment #4) > Comment on attachment 246288 [details] > [PATCH] Fix. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=246288&action=review > > > Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js:291 > > + this._groupedIntoFolders = false; > > We don't want to reach into the superclass' member variables here. > > Actually, now that I see this code, it seems > "FolderizedTreeElement.prototype.removeChildren" would be appropriate to > reset this flag. removeChildren is called here, and if that really does take > us to 0 children, it should reset this state. This actually leads to: [Error] RangeError: Maximum call stack size exceeded. removeChildren (FolderizedTreeElement.js, line 83) onpopulate (FrameTreeElement.js, line 235) expand (TreeOutline.js, line 844) shouldRefreshChildren (TreeOutline.js, line 636) addChildForRepresentedObject (FolderizedTreeElement.js, line 117) onpopulate (FrameTreeElement.js, line 238) expand (TreeOutline.js, line 844) shouldRefreshChildren (TreeOutline.js, line 636) addChildForRepresentedObject (FolderizedTreeElement.js, line 117) onpopulate (FrameTreeElement.js, line 238) expand (TreeOutline.js, line 844) shouldRefreshChildren (TreeOutline.js, line 636) addChildForRepresentedObject (FolderizedTreeElement.js, line 117) onpopulate (FrameTreeElement.js, line 238) expand (TreeOutline.js, line 844) shouldRefreshChildren (TreeOutline.js, line 636) addChildForRepresentedObject (FolderizedTreeElement.js, line 117) ... Also: [Error] RangeError: Maximum call stack size exceeded. (anonymous function) (FolderizedTreeElement.js, line 166) updateParentStatus (FolderizedTreeElement.js, line 166) addChildForRepresentedObject (FolderizedTreeElement.js, line 106) onpopulate (FrameTreeElement.js, line 238) expand (TreeOutline.js, line 844) shouldRefreshChildren (TreeOutline.js, line 636) addChildForRepresentedObject (FolderizedTreeElement.js, line 117) onpopulate (FrameTreeElement.js, line 238) expand (TreeOutline.js, line 844) shouldRefreshChildren (TreeOutline.js, line 636) addChildForRepresentedObject (FolderizedTreeElement.js, line 117) onpopulate (FrameTreeElement.js, line 238) expand (TreeOutline.js, line 844) shouldRefreshChildren (TreeOutline.js, line 636) ... I think this is perhaps right but it may need to do more than just set that flag. 1068168 6 jonowells 2015-02-10 15:36:18 -0800 FolderizedTreeElement#_shouldGroupIntoFolders returns true when it shouldn't after a navigation in the main frame. Working to fix. 1068414 7 246401 jonowells 2015-02-11 11:35:20 -0800 Created attachment 246401 [PATCH] attempted fix 2. I noticed that _shouldGroupIntoFolders() returns true permanently after it returns true one time. I changed this, and set this._groupedIntoFolders to false whenever _shouldGroupIntoFolders suddenly returns false. This might not be terribly performant, and I'm up for ideas on how to make this better. 1068522 8 246419 jonowells 2015-02-11 17:22:05 -0800 Created attachment 246419 [PATCH] attempted fix 2a. Oops. Left a debug thing in there. Removed. 1068648 9 246419 timothy 2015-02-12 09:54:59 -0800 Comment on attachment 246419 [PATCH] attempted fix 2a. View in context: https://bugs.webkit.org/attachment.cgi?id=246419&action=review On the right track. > Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js:93 > + if (this._groupedIntoFolders && !this._shouldGroupIntoFolders()) > + this._groupedIntoFolders = false; I think you should do this unconditionally. _shouldGroupIntoFolders() will never return true if all children were removed. > Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js:-315 > - // Already grouped into folders, keep it that way. > - if (this._groupedIntoFolders) > - return true; The point of this code was to prevent jumping between folders and no-folders if the page adds then removes resources, then adds more back. Clearing the flag unconditionally in removeChildren is good, but I think this early return should stay. 1068749 10 jonowells 2015-02-12 14:35:52 -0800 (In reply to comment #9) > Comment on attachment 246419 [details] > [PATCH] attempted fix 2a. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=246419&action=review > > On the right track. > > > Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js:93 > > + if (this._groupedIntoFolders && !this._shouldGroupIntoFolders()) > > + this._groupedIntoFolders = false; > > I think you should do this unconditionally. _shouldGroupIntoFolders() will > never return true if all children were removed. > Ok I just figured out how I can do that without creating an infinite function call cycle. Patch coming. 1068751 11 246474 jonowells 2015-02-12 14:36:56 -0800 Created attachment 246474 [PATCH] Attempted fix 3. This adds a check to prevent setting shouldRefreshChildren unnecessarily, which avoids infinite recursion. 1069550 12 246474 timothy 2015-02-16 13:28:30 -0800 Comment on attachment 246474 [PATCH] Attempted fix 3. View in context: https://bugs.webkit.org/attachment.cgi?id=246474&action=review > Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js:118 > + if (this.children.length) > + this.shouldRefreshChildren = true; I am not sure this is correct. If this.children.length is 0, the frame could still needed refreshed so on populate will be called. 1069671 13 246704 jonowells 2015-02-16 16:51:52 -0800 Created attachment 246704 [PATCH] attempted fix 4. Upon Tim's suggestion, I've prevented this.shouldRefreshChildren from being set back to true while onpopulate takes place. 1069682 14 246704 timothy 2015-02-16 17:10:39 -0800 Comment on attachment 246704 [PATCH] attempted fix 4. View in context: https://bugs.webkit.org/attachment.cgi?id=246704&action=review > Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js:108 > + if (!this.treeOutline && !this._isPopulating) { We typically don't put "is" in a boolean property. Just _populating or _populatingChildElements. > Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js:119 > if (!this._groupedIntoFolders && this._shouldGroupIntoFolders()) { > // Mark as needing a refresh to rebuild the tree into folders. > this._groupedIntoFolders = true; > - this.shouldRefreshChildren = true; > + if (!this._isPopulating) > + this.shouldRefreshChildren = true; > return; I'm not sure _groupedIntoFolders should change while _isPopulating, so the guard should be a level up. (Even thought I doubt this will change once onpopulate starts.) > Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js:233 > + this._isPopulating = true; This should not use a private property. It needs to be public or use a public getter and setter to be used across classes. > Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js:256 > + this._isPopulating = false; Ditto. 1069685 15 246704 jonowells 2015-02-16 17:17:37 -0800 Comment on attachment 246704 [PATCH] attempted fix 4. View in context: https://bugs.webkit.org/attachment.cgi?id=246704&action=review >> Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js:119 >> return; > > I'm not sure _groupedIntoFolders should change while _isPopulating, so the guard should be a level up. (Even thought I doubt this will change once onpopulate starts.) We actually need to set _groupedIntoFolders to true here or else it seems based on testing that folderization never occurs. 1069687 16 246707 jonowells 2015-02-16 17:21:05 -0800 Created attachment 246707 [PATCH] Attempted fix 5. 1070014 17 246786 jonowells 2015-02-17 19:19:43 -0800 Created attachment 246786 [PATCH] Attempted fix 6. Based on online discussions, this might be the better-organized approach. Tested to work with source maps, sites with many resources, and sites with few resources. 1070153 18 246786 timothy 2015-02-18 11:22:33 -0800 Comment on attachment 246786 [PATCH] Attempted fix 6. View in context: https://bugs.webkit.org/attachment.cgi?id=246786&action=review > Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js:113 > + if (!this.populating) { > + if (!this.treeOutline) { > + // Just mark as needing to update to avoid doing work that might not be needed. > + this.shouldRefreshChildren = true; > + return; > + } > + this._switchToFolderGroupsIfNecessary(); > } I don't see any calls to addChildForRepresentedObject other than the two places that now call prepareToPopulate. You should be able to remove this code, this.populating and _switchToFolderGroupsIfNecessary. > Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js:173 > + if (this._shouldSwitchToFolderGroups()) If you remove _switchToFolderGroupsIfNecessary you can move _shouldSwitchToFolderGroups into here and get rid of _shouldSwitchToFolderGroups too. 1070256 19 jonowells 2015-02-18 15:55:36 -0800 Committed r180319: <http://trac.webkit.org/changeset/180319> 246288 2015-02-09 14:21:11 -0800 2015-02-11 11:35:20 -0800 [PATCH] Fix. folders.diff text/plain 2632 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDczZmU5NTQuLjA4NGQ4ZWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAyLTA5ICBKb25vIFdlbGxzICA8 am9ub3dlbGxzQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnNwZWN0aW5n IGEgcGFnZSB3aGVyZSByZXNvdXJjZXMgYXJlIGluIGZvbGRlcnMgZm9yY2VzIGZvbGRlciBvcmdh bml6YXRpb24gb24gZXZlcnkgc3Vic2VxdWVudCBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEzOTcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIF9tYWluUmVzb3VyY2VEaWRDaGFuZ2UgaXMg Y2FsbGVkIG9uIEZyYW1lVHJlZUVsZW1lbnQgb24gYSBuYXZpZ2F0aW9uLCBzZXQgdGhlIGVsZW1l bnQncyBfZ3JvdXBlZEludG9Gb2xkZXJzCisgICAgICAgIHNldHRpbmcgdG8gZmFsc2Ugc28gdGhh dCBwYWdlcyB3aXRoIGZldyByZXNvdXJjZXMgd29uJ3QgZ3JvdXAgdGhlIHJlc291cmNlcyBpbnRv IGZvbGRlcnMgdW5uZWNlc3NhcmlseS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv RnJhbWVUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVt ZW50LnByb3RvdHlwZS5fbWFpblJlc291cmNlRGlkQ2hhbmdlKTogU2V0IHRoaXMuX2dyb3VwZWRJ bnRvRm9sZGVycyB0byBmYWxzZS4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291 cmNlVHJlZUVsZW1lbnQuanM6IERyaXZlLWJ5IGZpeCB0byBpbmhlcml0YW5jZSBzdHlsZS4KKwog MjAxNS0wMi0wNiAgSm9ubyBXZWxscyAgPGpvbm93ZWxsc0BhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTjogQ1NTIFJlc291cmNlIGFwcGVhcnMgYXMgZW1wdHkg YWZ0ZXIgZWRpdGluZyBpdCB2aWEgU3R5bGVzIHNpZGViYXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVFbGVtZW50 LmpzCmluZGV4IGQzNzk3ZmMuLjdmMjJkZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVUcmVlRWxlbWVudC5qcwpA QCAtMjg4LDYgKzI4OCw4IEBAIFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50LnByb3RvdHlw ZSA9IHsKICAgICAgICAgLy8gc2hvdWxkUmVmcmVzaENoaWxkcmVuIHdpbGwgY2FsbCBvbnBvcHVs YXRlIGlmIGV4cGFuZGVkIGlzIHRydWUuCiAgICAgICAgIHRoaXMuX3VwZGF0ZUV4cGFuZGVkU2V0 dGluZygpOwogCisgICAgICAgIHRoaXMuX2dyb3VwZWRJbnRvRm9sZGVycyA9IGZhbHNlOworCiAg ICAgICAgIGlmICh0aGlzLl9mcmFtZS5pc01haW5GcmFtZSgpKQogICAgICAgICAgICAgdGhpcy5f dXBkYXRlRG93bmxvYWRCdXR0b24oKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVHJlZUVsZW1lbnQuanMK aW5kZXggY2U1OTI1MC4uMzBjNzVmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50Lmpz CkBAIC03Niw2ICs3Niw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50LmNvbXBh cmVGb2xkZXJBbmRSZXNvdXJjZVRyZWVFbGVtZW50cyA9IGZ1bmN0aW9uCiAKIFdlYkluc3BlY3Rv ci5SZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2Vi SW5zcGVjdG9yLlJlc291cmNlVHJlZUVsZW1lbnQsCisgICAgX19wcm90b19fOiBXZWJJbnNwZWN0 b3IuU291cmNlQ29kZVRyZWVFbGVtZW50LnByb3RvdHlwZSwKIAogICAgIC8vIFB1YmxpYwogCkBA IC0xOTQsNSArMTk1LDMgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90 eXBlID0gewogICAgICAgICB0aGlzLmNhbGxGaXJzdEFuY2VzdG9yRnVuY3Rpb24oImRlc2NlbmRh bnRSZXNvdXJjZVRyZWVFbGVtZW50VHlwZURpZENoYW5nZSIsIFt0aGlzLCBldmVudC5kYXRhLm9s ZFR5cGVdKTsKICAgICB9CiB9OwotCi1XZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudC5w cm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUcmVlRWxlbWVudC5w cm90b3R5cGU7Cg== 246401 2015-02-11 11:35:20 -0800 2015-02-11 17:22:05 -0800 [PATCH] attempted fix 2. folders.diff text/plain 4154 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDY3OWE4M2MuLjA4MWUwMDMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTAyLTExICBKb25vIFdlbGxzICA8 am9ub3dlbGxzQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnNwZWN0aW5n IGEgcGFnZSB3aGVyZSByZXNvdXJjZXMgYXJlIGluIGZvbGRlcnMgZm9yY2VzIGZvbGRlciBvcmdh bml6YXRpb24gb24gZXZlcnkgc3Vic2VxdWVudCBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEzOTcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHJlbW92ZUNoaWxkcmVuIGlzIGNhbGxlZCBv biBhbiBpbnN0YW5jZSBvZiBhIEZvbGRlcml6ZWRUcmVlRWxlbWVudCwgdGhlIGluc3RhbmNlIHdp bGwgY2hlY2sgdG8gc2VlIHdoZXRoZXIKKyAgICAgICAgaXQgc2hvdWxkIHN0aWxsIGdyb3VwIGl0 cyBjaGlsZHJlbiBpbnRvIGZvbGRlcnMuIElmIG5vdCwgaXQgd2lsbCBjaGFuZ2UgaXRzIHNldHRp bmcgdG8gbm8gbG9uZ2VyIGdyb3VwIGludG8KKyAgICAgICAgZm9sZGVycy4gVGhpcyB3aWxsIHBy ZXZlbnQgdW5uZWNlc3NhcnkgZm9sZGVyaXphdGlvbiB1cG9uIG5hdmlnYXRpb24gaW4gdGhlIG1h aW4gZnJhbWUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRUcmVl RWxlbWVudC5qczogc2V0IF9ncm91cGVkSW50b0ZvbGRlcnMgdG8gZmFsc2Ugd2hlbiBubyBsb25n ZXIgbmVjZXNzYXJ5LgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVu dC5wcm90b3R5cGUuc2V0IHJlbW92ZUNoaWxkcmVuKToKKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50LmpzOiBEcml2ZS1ieSBpbmhlcml0YW5jZSBzdHls ZSBmaXguCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50 LmpzOiBEcml2ZS1ieSBpbmhlcml0YW5jZSBzdHlsZSBmaXguCisKIDIwMTUtMDItMTAgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBCZXR0ZXIgaGFuZGxlIHVua25vd24gcmVsZWFzZSB2ZXJzaW9ucwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVyaXplZFRyZWVFbGVt ZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVy aXplZFRyZWVFbGVtZW50LmpzCmluZGV4IDBmZTYyYTguLmMzYTZkZWYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRUcmVlRWxl bWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G b2xkZXJpemVkVHJlZUVsZW1lbnQuanMKQEAgLTg4LDYgKzg4LDkgQEAgV2ViSW5zcGVjdG9yLkZv bGRlcml6ZWRUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBmb2xkZXIucmVt b3ZlQ2hpbGRyZW4oKTsKIAogICAgICAgICB0aGlzLl9mb2xkZXJUeXBlTWFwLmNsZWFyKCk7CisK KyAgICAgICAgaWYgKHRoaXMuX2dyb3VwZWRJbnRvRm9sZGVycyAmJiAhdGhpcy5fc2hvdWxkR3Jv dXBJbnRvRm9sZGVycygpKQorICAgICAgICAgICAgdGhpcy5fZ3JvdXBlZEludG9Gb2xkZXJzID0g ZmFsc2U7CiAgICAgfSwKIAogICAgIC8vIFByb3RlY3RlZApAQCAtMzA4LDEyICszMTEsOCBAQCBX ZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAg cmV0dXJuIG51bGw7CiAgICAgfSwKIAotICAgIF9zaG91bGRHcm91cEludG9Gb2xkZXJzOiBmdW5j dGlvbigpCisgICAgX3Nob3VsZEdyb3VwSW50b0ZvbGRlcnM6IGZ1bmN0aW9uKGRlYnVnKQogICAg IHsKLSAgICAgICAgLy8gQWxyZWFkeSBncm91cGVkIGludG8gZm9sZGVycywga2VlcCBpdCB0aGF0 IHdheS4KLSAgICAgICAgaWYgKHRoaXMuX2dyb3VwZWRJbnRvRm9sZGVycykKLSAgICAgICAgICAg IHJldHVybiB0cnVlOwotCiAgICAgICAgIC8vIENoaWxkIG9iamVjdHMgYXJlIGdyb3VwZWQgaW50 byBmb2xkZXJzIGlmIG9uZSBvZiB0d28gdGhyZXNob2xkcyBhcmUgbWV0OgogICAgICAgICAvLyAx KSBPbmNlIHRoZSBudW1iZXIgb2YgbWVkaXVtIGNhdGVnb3JpZXMgcGFzc2VzIE51bWJlck9mTWVk aXVtQ2F0ZWdvcmllc1RocmVzaG9sZC4KICAgICAgICAgLy8gMikgV2hlbiB0aGVyZSBpcyBhIGNh dGVnb3J5IHRoYXQgcGFzc2VzIExhcmdlQ2hpbGRDb3VudFRocmVzaG9sZCBhbmQgdGhlcmUgYXJl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9H ZW5lcmFsVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9HZW5lcmFsVHJlZUVsZW1lbnQuanMKaW5kZXggYWZlZTVkOC4uMGZmM2UxMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJh bFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0dlbmVyYWxUcmVlRWxlbWVudC5qcwpAQCAtNTIsNiArNTIsNyBAQCBXZWJJbnNwZWN0 b3IuR2VuZXJhbFRyZWVFbGVtZW50LkV2ZW50ID0gewogCiBXZWJJbnNwZWN0b3IuR2VuZXJhbFRy ZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLkdl bmVyYWxUcmVlRWxlbWVudCwKKyAgICBfX3Byb3RvX186IFRyZWVFbGVtZW50LnByb3RvdHlwZSwK IAogICAgIC8vIFB1YmxpYwogCkBAIC0zOTQsNSArMzk1LDMgQEAgV2ViSW5zcGVjdG9yLkdlbmVy YWxUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9zdGF0dXNFbGVt ZW50LnRleHRDb250ZW50ID0gdGhpcy5fc3RhdHVzOwogICAgIH0KIH07Ci0KLVdlYkluc3BlY3Rv ci5HZW5lcmFsVHJlZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFRyZWVFbGVtZW50LnBy b3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Jlc291cmNlVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50LmpzCmluZGV4IGNlNTkyNTAuLjMw Yzc1ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Jlc291cmNlVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUcmVlRWxlbWVudC5qcwpAQCAtNzYsNiArNzYsNyBA QCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudC5jb21wYXJlRm9sZGVyQW5kUmVzb3Vy Y2VUcmVlRWxlbWVudHMgPSBmdW5jdGlvbgogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxl bWVudC5wcm90b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5SZXNvdXJj ZVRyZWVFbGVtZW50LAorICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUcmVl RWxlbWVudC5wcm90b3R5cGUsCiAKICAgICAvLyBQdWJsaWMKIApAQCAtMTk0LDUgKzE5NSwzIEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAg dGhpcy5jYWxsRmlyc3RBbmNlc3RvckZ1bmN0aW9uKCJkZXNjZW5kYW50UmVzb3VyY2VUcmVlRWxl bWVudFR5cGVEaWRDaGFuZ2UiLCBbdGhpcywgZXZlbnQuZGF0YS5vbGRUeXBlXSk7CiAgICAgfQog fTsKLQotV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9f XyA9IFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVHJlZUVsZW1lbnQucHJvdG90eXBlOwo= 246419 2015-02-11 17:22:05 -0800 2015-02-12 14:36:56 -0800 [PATCH] attempted fix 2a. folders.diff text/plain 4142 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGRkMWUzZjguLjM5YmU2OWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTAyLTExICBKb25vIFdlbGxzICA8 am9ub3dlbGxzQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnNwZWN0aW5n IGEgcGFnZSB3aGVyZSByZXNvdXJjZXMgYXJlIGluIGZvbGRlcnMgZm9yY2VzIGZvbGRlciBvcmdh bml6YXRpb24gb24gZXZlcnkgc3Vic2VxdWVudCBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEzOTcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHJlbW92ZUNoaWxkcmVuIGlzIGNhbGxlZCBv biBhbiBpbnN0YW5jZSBvZiBhIEZvbGRlcml6ZWRUcmVlRWxlbWVudCwgdGhlIGluc3RhbmNlIHdp bGwgY2hlY2sgdG8gc2VlIHdoZXRoZXIKKyAgICAgICAgaXQgc2hvdWxkIHN0aWxsIGdyb3VwIGl0 cyBjaGlsZHJlbiBpbnRvIGZvbGRlcnMuIElmIG5vdCwgaXQgd2lsbCBjaGFuZ2UgaXRzIHNldHRp bmcgdG8gbm8gbG9uZ2VyIGdyb3VwIGludG8KKyAgICAgICAgZm9sZGVycy4gVGhpcyB3aWxsIHBy ZXZlbnQgdW5uZWNlc3NhcnkgZm9sZGVyaXphdGlvbiB1cG9uIG5hdmlnYXRpb24gaW4gdGhlIG1h aW4gZnJhbWUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRUcmVl RWxlbWVudC5qczogc2V0IF9ncm91cGVkSW50b0ZvbGRlcnMgdG8gZmFsc2Ugd2hlbiBubyBsb25n ZXIgbmVjZXNzYXJ5LgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVu dC5wcm90b3R5cGUuc2V0IHJlbW92ZUNoaWxkcmVuKToKKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50LmpzOiBEcml2ZS1ieSBpbmhlcml0YW5jZSBzdHls ZSBmaXguCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50 LmpzOiBEcml2ZS1ieSBpbmhlcml0YW5jZSBzdHlsZSBmaXguCisKIDIwMTUtMDItMTEgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogUkVHUkVTU0lPTjogQ2xpY2tpbmcgc2VsZWN0ZWQgaXRlbSBpbiB0aGUgc2lkZWJhciBzZWNv bmQgdGltZSBzaG91bGQgc2Nyb2xsIHRvIHRoZSBjb3JyZXNwb25kaW5nIGxpbmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRU cmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0ZvbGRlcml6ZWRUcmVlRWxlbWVudC5qcwppbmRleCAwZmU2MmE4Li5hYTkzYTc3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb2xkZXJpemVk VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRm9sZGVyaXplZFRyZWVFbGVtZW50LmpzCkBAIC04OCw2ICs4OCw5IEBAIFdlYkluc3Bl Y3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgZm9s ZGVyLnJlbW92ZUNoaWxkcmVuKCk7CiAKICAgICAgICAgdGhpcy5fZm9sZGVyVHlwZU1hcC5jbGVh cigpOworCisgICAgICAgIGlmICh0aGlzLl9ncm91cGVkSW50b0ZvbGRlcnMgJiYgIXRoaXMuX3No b3VsZEdyb3VwSW50b0ZvbGRlcnMoKSkKKyAgICAgICAgICAgIHRoaXMuX2dyb3VwZWRJbnRvRm9s ZGVycyA9IGZhbHNlOwogICAgIH0sCiAKICAgICAvLyBQcm90ZWN0ZWQKQEAgLTMxMCwxMCArMzEz LDYgQEAgV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAK ICAgICBfc2hvdWxkR3JvdXBJbnRvRm9sZGVyczogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAg Ly8gQWxyZWFkeSBncm91cGVkIGludG8gZm9sZGVycywga2VlcCBpdCB0aGF0IHdheS4KLSAgICAg ICAgaWYgKHRoaXMuX2dyb3VwZWRJbnRvRm9sZGVycykKLSAgICAgICAgICAgIHJldHVybiB0cnVl OwotCiAgICAgICAgIC8vIENoaWxkIG9iamVjdHMgYXJlIGdyb3VwZWQgaW50byBmb2xkZXJzIGlm IG9uZSBvZiB0d28gdGhyZXNob2xkcyBhcmUgbWV0OgogICAgICAgICAvLyAxKSBPbmNlIHRoZSBu dW1iZXIgb2YgbWVkaXVtIGNhdGVnb3JpZXMgcGFzc2VzIE51bWJlck9mTWVkaXVtQ2F0ZWdvcmll c1RocmVzaG9sZC4KICAgICAgICAgLy8gMikgV2hlbiB0aGVyZSBpcyBhIGNhdGVnb3J5IHRoYXQg cGFzc2VzIExhcmdlQ2hpbGRDb3VudFRocmVzaG9sZCBhbmQgdGhlcmUgYXJlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsVHJlZUVs ZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5l cmFsVHJlZUVsZW1lbnQuanMKaW5kZXggYWZlZTVkOC4uMGZmM2UxMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVy YWxUcmVlRWxlbWVudC5qcwpAQCAtNTIsNiArNTIsNyBAQCBXZWJJbnNwZWN0b3IuR2VuZXJhbFRy ZWVFbGVtZW50LkV2ZW50ID0gewogCiBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50LnBy b3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLkdlbmVyYWxUcmVlRWxl bWVudCwKKyAgICBfX3Byb3RvX186IFRyZWVFbGVtZW50LnByb3RvdHlwZSwKIAogICAgIC8vIFB1 YmxpYwogCkBAIC0zOTQsNSArMzk1LDMgQEAgV2ViSW5zcGVjdG9yLkdlbmVyYWxUcmVlRWxlbWVu dC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9zdGF0dXNFbGVtZW50LnRleHRDb250 ZW50ID0gdGhpcy5fc3RhdHVzOwogICAgIH0KIH07Ci0KLVdlYkluc3BlY3Rvci5HZW5lcmFsVHJl ZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFRyZWVFbGVtZW50LnByb3RvdHlwZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291 cmNlVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50LmpzCmluZGV4IGNlNTkyNTAuLjMwYzc1ZmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNl VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUmVzb3VyY2VUcmVlRWxlbWVudC5qcwpAQCAtNzYsNiArNzYsNyBAQCBXZWJJbnNwZWN0 b3IuUmVzb3VyY2VUcmVlRWxlbWVudC5jb21wYXJlRm9sZGVyQW5kUmVzb3VyY2VUcmVlRWxlbWVu dHMgPSBmdW5jdGlvbgogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50 LAorICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUcmVlRWxlbWVudC5wcm90 b3R5cGUsCiAKICAgICAvLyBQdWJsaWMKIApAQCAtMTk0LDUgKzE5NSwzIEBAIFdlYkluc3BlY3Rv ci5SZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5jYWxsRmly c3RBbmNlc3RvckZ1bmN0aW9uKCJkZXNjZW5kYW50UmVzb3VyY2VUcmVlRWxlbWVudFR5cGVEaWRD aGFuZ2UiLCBbdGhpcywgZXZlbnQuZGF0YS5vbGRUeXBlXSk7CiAgICAgfQogfTsKLQotV2ViSW5z cGVjdG9yLlJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3Bl Y3Rvci5Tb3VyY2VDb2RlVHJlZUVsZW1lbnQucHJvdG90eXBlOwo= 246474 2015-02-12 14:36:56 -0800 2015-02-16 16:52:11 -0800 [PATCH] Attempted fix 3. folders.diff text/plain 3983 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQ4NzdkMzAuLjgxMDdhZjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTAyLTEyICBKb25vIFdlbGxzICA8 am9ub3dlbGxzQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnNwZWN0aW5n IGEgcGFnZSB3aGVyZSByZXNvdXJjZXMgYXJlIGluIGZvbGRlcnMgZm9yY2VzIGZvbGRlciBvcmdh bml6YXRpb24gb24gZXZlcnkgc3Vic2VxdWVudCBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEzOTcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHJlbW92ZUNoaWxkcmVuIGlzIGNhbGxlZCBv biBhbiBpbnN0YW5jZSBvZiBhIEZvbGRlcml6ZWRUcmVlRWxlbWVudCwgaXRzIHNldHRpbmcgX2dy b3VwZWRJbnRvRm9sZGVycworICAgICAgICB3aWxsIGJlIHNldCB0byBmYWxzZS4gVGhpcyB3aWxs IHByZXZlbnQgdW5uZWNlc3NhcnkgZm9sZGVyaXphdGlvbiB1cG9uIG5hdmlnYXRpb24gaW4gdGhl IG1haW4gZnJhbWUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRU cmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1l bnQucHJvdG90eXBlLnNldCByZW1vdmVDaGlsZHJlbik6IFNldCBfZ3JvdXBlZEludG9Gb2xkZXJz IHRvIGZhbHNlLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVudC5w cm90b3R5cGUuYWRkQ2hpbGRGb3JSZXByZXNlbnRlZE9iamVjdCk6IENoZWNrIHRvIHNlZSBpZiB0 aGVyZSBhcmUgYW55CisgICAgICAgIGNoaWxkcmVuIHRvIHJlZnJlc2ggdG8gYXZvaWQgYW4gaW5m aW5pdGUgcmVjdXJzaW9uLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFs VHJlZUVsZW1lbnQuanM6IERyaXZlLWJ5IGluaGVyaXRhbmNlIHN0eWxlIGZpeC4KKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVHJlZUVsZW1lbnQuanM6IERyaXZlLWJ5IGlu aGVyaXRhbmNlIHN0eWxlIGZpeC4KKwogMjAxNS0wMi0xMiAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdA Y3Mud2FzaGluZ3Rvbi5lZHU+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIGtleWJvYXJk IHNob3J0Y3V0IHRvIGVuYWJsZS9kaXNhYmxlIGFsbCBicmVha3BvaW50cwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVyaXplZFRyZWVF bGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9s ZGVyaXplZFRyZWVFbGVtZW50LmpzCmluZGV4IDBmZTYyYTguLmUzYjdlMDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRUcmVl RWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Gb2xkZXJpemVkVHJlZUVsZW1lbnQuanMKQEAgLTg4LDYgKzg4LDggQEAgV2ViSW5zcGVjdG9y LkZvbGRlcml6ZWRUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBmb2xkZXIu cmVtb3ZlQ2hpbGRyZW4oKTsKIAogICAgICAgICB0aGlzLl9mb2xkZXJUeXBlTWFwLmNsZWFyKCk7 CisKKyAgICAgICAgdGhpcy5fZ3JvdXBlZEludG9Gb2xkZXJzID0gZmFsc2U7CiAgICAgfSwKIAog ICAgIC8vIFByb3RlY3RlZApAQCAtMTEyLDcgKzExNCw4IEBAIFdlYkluc3BlY3Rvci5Gb2xkZXJp emVkVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX2dyb3VwZWRJ bnRvRm9sZGVycyAmJiB0aGlzLl9zaG91bGRHcm91cEludG9Gb2xkZXJzKCkpIHsKICAgICAgICAg ICAgIC8vIE1hcmsgYXMgbmVlZGluZyBhIHJlZnJlc2ggdG8gcmVidWlsZCB0aGUgdHJlZSBpbnRv IGZvbGRlcnMuCiAgICAgICAgICAgICB0aGlzLl9ncm91cGVkSW50b0ZvbGRlcnMgPSB0cnVlOwot ICAgICAgICAgICAgdGhpcy5zaG91bGRSZWZyZXNoQ2hpbGRyZW4gPSB0cnVlOworICAgICAgICAg ICAgaWYgKHRoaXMuY2hpbGRyZW4ubGVuZ3RoKQorICAgICAgICAgICAgICAgIHRoaXMuc2hvdWxk UmVmcmVzaENoaWxkcmVuID0gdHJ1ZTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9H ZW5lcmFsVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9HZW5lcmFsVHJlZUVsZW1lbnQuanMKaW5kZXggYWZlZTVkOC4uMGZmM2UxMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJh bFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0dlbmVyYWxUcmVlRWxlbWVudC5qcwpAQCAtNTIsNiArNTIsNyBAQCBXZWJJbnNwZWN0 b3IuR2VuZXJhbFRyZWVFbGVtZW50LkV2ZW50ID0gewogCiBXZWJJbnNwZWN0b3IuR2VuZXJhbFRy ZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLkdl bmVyYWxUcmVlRWxlbWVudCwKKyAgICBfX3Byb3RvX186IFRyZWVFbGVtZW50LnByb3RvdHlwZSwK IAogICAgIC8vIFB1YmxpYwogCkBAIC0zOTQsNSArMzk1LDMgQEAgV2ViSW5zcGVjdG9yLkdlbmVy YWxUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9zdGF0dXNFbGVt ZW50LnRleHRDb250ZW50ID0gdGhpcy5fc3RhdHVzOwogICAgIH0KIH07Ci0KLVdlYkluc3BlY3Rv ci5HZW5lcmFsVHJlZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFRyZWVFbGVtZW50LnBy b3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Jlc291cmNlVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50LmpzCmluZGV4IGNlNTkyNTAuLjMw Yzc1ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Jlc291cmNlVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUcmVlRWxlbWVudC5qcwpAQCAtNzYsNiArNzYsNyBA QCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudC5jb21wYXJlRm9sZGVyQW5kUmVzb3Vy Y2VUcmVlRWxlbWVudHMgPSBmdW5jdGlvbgogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxl bWVudC5wcm90b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5SZXNvdXJj ZVRyZWVFbGVtZW50LAorICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUcmVl RWxlbWVudC5wcm90b3R5cGUsCiAKICAgICAvLyBQdWJsaWMKIApAQCAtMTk0LDUgKzE5NSwzIEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAg dGhpcy5jYWxsRmlyc3RBbmNlc3RvckZ1bmN0aW9uKCJkZXNjZW5kYW50UmVzb3VyY2VUcmVlRWxl bWVudFR5cGVEaWRDaGFuZ2UiLCBbdGhpcywgZXZlbnQuZGF0YS5vbGRUeXBlXSk7CiAgICAgfQog fTsKLQotV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9f XyA9IFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVHJlZUVsZW1lbnQucHJvdG90eXBlOwo= 246704 2015-02-16 16:51:52 -0800 2015-02-16 17:21:05 -0800 [PATCH] attempted fix 4. folders.diff text/plain 5345 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDUwYWY4YWUuLjlhYjk1NzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTAyLTE2ICBKb25vIFdlbGxzICA8 am9ub3dlbGxzQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnNwZWN0aW5n IGEgcGFnZSB3aGVyZSByZXNvdXJjZXMgYXJlIGluIGZvbGRlcnMgZm9yY2VzIGZvbGRlciBvcmdh bml6YXRpb24gb24gZXZlcnkgc3Vic2VxdWVudCBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEzOTcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHJlbW92ZUNoaWxkcmVuIGlzIGNhbGxlZCBv biBhbiBpbnN0YW5jZSBvZiBhIEZvbGRlcml6ZWRUcmVlRWxlbWVudCwgdGhlIGVsZW1lbnQncyBf Z3JvdXBlZEludG9Gb2xkZXJzIGZsYWcKKyAgICAgICAgd2lsbCBiZSBzZXQgdG8gZmFsc2UuIFRo aXMgd2lsbCBwcmV2ZW50IHVubmVjZXNzYXJ5IGZvbGRlcml6YXRpb24gdXBvbiBhIGZyYW1lIG5h dmlnYXRpb24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRUcmVl RWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQu cHJvdG90eXBlLnNldCByZW1vdmVDaGlsZHJlbik6IFNldCBfZ3JvdXBlZEludG9Gb2xkZXJzIHRv IGZhbHNlLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVudC5wcm90 b3R5cGUuYWRkQ2hpbGRGb3JSZXByZXNlbnRlZE9iamVjdCk6CisgICAgICAgIENoZWNrIGlmIGVs ZW1lbnQgaXMgaW4gdGhlIG1pZGRsZSBvZiBwb3B1bGF0aW5nLiBJZiBzbywgZG8gbm90IHN3aXRj aCBzaG91bGRSZWZyZXNoQ2hpbGRyZW4gdG8gdHJ1ZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvRnJhbWVUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFt ZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnBvcHVsYXRlKTogQWRkIF9pc1BvcHVsYXRpbmcgZmxh Zy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50Lmpz OiBEcml2ZS1ieSBpbmhlcml0YW5jZSBzdHlsZSBmaXguCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50LmpzOiBEcml2ZS1ieSBpbmhlcml0YW5jZSBzdHls ZSBmaXguCisKIDIwMTUtMDItMTUgIEJyaWFuIEouIEJ1cmcgIDxidXJnQGNzLndhc2hpbmd0b24u ZWR1PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSB1bnVzZWQgWEhSIHJlcGxheSBj b2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Gb2xkZXJpemVkVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Gb2xkZXJpemVkVHJlZUVsZW1lbnQuanMKaW5kZXggMGZlNjJhOC4uNGVl OTkxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRm9sZGVyaXplZFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRUcmVlRWxlbWVudC5qcwpAQCAtODgsNiArODgs OCBAQCBXZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIGZvbGRlci5yZW1vdmVDaGlsZHJlbigpOwogCiAgICAgICAgIHRoaXMuX2ZvbGRl clR5cGVNYXAuY2xlYXIoKTsKKworICAgICAgICB0aGlzLl9ncm91cGVkSW50b0ZvbGRlcnMgPSBm YWxzZTsKICAgICB9LAogCiAgICAgLy8gUHJvdGVjdGVkCkBAIC0xMDMsNyArMTA1LDcgQEAgV2Vi SW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAg dGhpcy51cGRhdGVQYXJlbnRTdGF0dXMoKTsKIAotICAgICAgICBpZiAoIXRoaXMudHJlZU91dGxp bmUpIHsKKyAgICAgICAgaWYgKCF0aGlzLnRyZWVPdXRsaW5lICYmICF0aGlzLl9pc1BvcHVsYXRp bmcpIHsKICAgICAgICAgICAgIC8vIEp1c3QgbWFyayBhcyBuZWVkaW5nIHRvIHVwZGF0ZSB0byBh dm9pZCBkb2luZyB3b3JrIHRoYXQgbWlnaHQgbm90IGJlIG5lZWRlZC4KICAgICAgICAgICAgIHRo aXMuc2hvdWxkUmVmcmVzaENoaWxkcmVuID0gdHJ1ZTsKICAgICAgICAgICAgIHJldHVybjsKQEAg LTExMiw3ICsxMTQsOCBAQCBXZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50LnByb3Rv dHlwZSA9IHsKICAgICAgICAgaWYgKCF0aGlzLl9ncm91cGVkSW50b0ZvbGRlcnMgJiYgdGhpcy5f c2hvdWxkR3JvdXBJbnRvRm9sZGVycygpKSB7CiAgICAgICAgICAgICAvLyBNYXJrIGFzIG5lZWRp bmcgYSByZWZyZXNoIHRvIHJlYnVpbGQgdGhlIHRyZWUgaW50byBmb2xkZXJzLgogICAgICAgICAg ICAgdGhpcy5fZ3JvdXBlZEludG9Gb2xkZXJzID0gdHJ1ZTsKLSAgICAgICAgICAgIHRoaXMuc2hv dWxkUmVmcmVzaENoaWxkcmVuID0gdHJ1ZTsKKyAgICAgICAgICAgIGlmICghdGhpcy5faXNQb3B1 bGF0aW5nKQorICAgICAgICAgICAgICAgIHRoaXMuc2hvdWxkUmVmcmVzaENoaWxkcmVuID0gdHJ1 ZTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVFbGVtZW50LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVUcmVlRWxlbWVu dC5qcwppbmRleCBkMzc5N2ZjLi42Mzg1ZmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQuanMK QEAgLTIzMCw2ICsyMzAsOCBAQCBXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLmNoaWxkcmVuLmxlbmd0aCAmJiAhdGhpcy5zaG91bGRS ZWZyZXNoQ2hpbGRyZW4pCiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgdGhpcy5faXNQ b3B1bGF0aW5nID0gdHJ1ZTsKKwogICAgICAgICB0aGlzLnNob3VsZFJlZnJlc2hDaGlsZHJlbiA9 IGZhbHNlOwogCiAgICAgICAgIHRoaXMucmVtb3ZlQ2hpbGRyZW4oKTsKQEAgLTI1MCw2ICsyNTIs OCBAQCBXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAg IHZhciBmbG93TWFwID0gdGhpcy5fZnJhbWUuZG9tVHJlZS5mbG93TWFwOwogICAgICAgICBmb3Ig KHZhciBmbG93S2V5IGluIGZsb3dNYXApCiAgICAgICAgICAgICB0aGlzLmFkZENoaWxkRm9yUmVw cmVzZW50ZWRPYmplY3QoZmxvd01hcFtmbG93S2V5XSk7CisKKyAgICAgICAgdGhpcy5faXNQb3B1 bGF0aW5nID0gZmFsc2U7CiAgICAgfSwKIAogICAgIG9uZXhwYW5kOiBmdW5jdGlvbigpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFs VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9HZW5lcmFsVHJlZUVsZW1lbnQuanMKaW5kZXggYWZlZTVkOC4uMGZmM2UxMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVF bGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0dlbmVyYWxUcmVlRWxlbWVudC5qcwpAQCAtNTIsNiArNTIsNyBAQCBXZWJJbnNwZWN0b3IuR2Vu ZXJhbFRyZWVFbGVtZW50LkV2ZW50ID0gewogCiBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVt ZW50LnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLkdlbmVyYWxU cmVlRWxlbWVudCwKKyAgICBfX3Byb3RvX186IFRyZWVFbGVtZW50LnByb3RvdHlwZSwKIAogICAg IC8vIFB1YmxpYwogCkBAIC0zOTQsNSArMzk1LDMgQEAgV2ViSW5zcGVjdG9yLkdlbmVyYWxUcmVl RWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9zdGF0dXNFbGVtZW50LnRl eHRDb250ZW50ID0gdGhpcy5fc3RhdHVzOwogICAgIH0KIH07Ci0KLVdlYkluc3BlY3Rvci5HZW5l cmFsVHJlZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFRyZWVFbGVtZW50LnByb3RvdHlw ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Jlc291cmNlVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50LmpzCmluZGV4IGNlNTkyNTAuLjMwYzc1ZmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jl c291cmNlVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUmVzb3VyY2VUcmVlRWxlbWVudC5qcwpAQCAtNzYsNiArNzYsNyBAQCBXZWJJ bnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudC5jb21wYXJlRm9sZGVyQW5kUmVzb3VyY2VUcmVl RWxlbWVudHMgPSBmdW5jdGlvbgogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudC5w cm90b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVF bGVtZW50LAorICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUcmVlRWxlbWVu dC5wcm90b3R5cGUsCiAKICAgICAvLyBQdWJsaWMKIApAQCAtMTk0LDUgKzE5NSwzIEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5j YWxsRmlyc3RBbmNlc3RvckZ1bmN0aW9uKCJkZXNjZW5kYW50UmVzb3VyY2VUcmVlRWxlbWVudFR5 cGVEaWRDaGFuZ2UiLCBbdGhpcywgZXZlbnQuZGF0YS5vbGRUeXBlXSk7CiAgICAgfQogfTsKLQot V2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdl Ykluc3BlY3Rvci5Tb3VyY2VDb2RlVHJlZUVsZW1lbnQucHJvdG90eXBlOwo= 246707 2015-02-16 17:21:05 -0800 2015-02-17 19:19:43 -0800 [PATCH] Attempted fix 5. folders.diff text/plain 5330 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDUwYWY4YWUuLjc1MmUwNTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTAyLTE2ICBKb25vIFdlbGxzICA8 am9ub3dlbGxzQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnNwZWN0aW5n IGEgcGFnZSB3aGVyZSByZXNvdXJjZXMgYXJlIGluIGZvbGRlcnMgZm9yY2VzIGZvbGRlciBvcmdh bml6YXRpb24gb24gZXZlcnkgc3Vic2VxdWVudCBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEzOTcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHJlbW92ZUNoaWxkcmVuIGlzIGNhbGxlZCBv biBhbiBpbnN0YW5jZSBvZiBhIEZvbGRlcml6ZWRUcmVlRWxlbWVudCwgdGhlIGVsZW1lbnQncyBf Z3JvdXBlZEludG9Gb2xkZXJzIGZsYWcKKyAgICAgICAgd2lsbCBiZSBzZXQgdG8gZmFsc2UuIFRo aXMgd2lsbCBwcmV2ZW50IHVubmVjZXNzYXJ5IGZvbGRlcml6YXRpb24gdXBvbiBhIGZyYW1lIG5h dmlnYXRpb24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRUcmVl RWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQu cHJvdG90eXBlLnNldCByZW1vdmVDaGlsZHJlbik6IFNldCBfZ3JvdXBlZEludG9Gb2xkZXJzIHRv IGZhbHNlLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVudC5wcm90 b3R5cGUuYWRkQ2hpbGRGb3JSZXByZXNlbnRlZE9iamVjdCk6CisgICAgICAgIENoZWNrIGlmIGVs ZW1lbnQgaXMgaW4gdGhlIG1pZGRsZSBvZiBwb3B1bGF0aW5nLiBJZiBzbywgZG8gbm90IHN3aXRj aCBzaG91bGRSZWZyZXNoQ2hpbGRyZW4gdG8gdHJ1ZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvRnJhbWVUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFt ZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnBvcHVsYXRlKTogQWRkIHBvcHVsYXRpbmcgZmxhZy4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50LmpzOiBE cml2ZS1ieSBpbmhlcml0YW5jZSBzdHlsZSBmaXguCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50LmpzOiBEcml2ZS1ieSBpbmhlcml0YW5jZSBzdHlsZSBm aXguCisKIDIwMTUtMDItMTUgIEJyaWFuIEouIEJ1cmcgIDxidXJnQGNzLndhc2hpbmd0b24uZWR1 PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSB1bnVzZWQgWEhSIHJlcGxheSBjb2Rl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G b2xkZXJpemVkVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Gb2xkZXJpemVkVHJlZUVsZW1lbnQuanMKaW5kZXggMGZlNjJhOC4uNzIyNmE1 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Rm9sZGVyaXplZFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRUcmVlRWxlbWVudC5qcwpAQCAtODgsNiArODgsOCBA QCBXZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIGZvbGRlci5yZW1vdmVDaGlsZHJlbigpOwogCiAgICAgICAgIHRoaXMuX2ZvbGRlclR5 cGVNYXAuY2xlYXIoKTsKKworICAgICAgICB0aGlzLl9ncm91cGVkSW50b0ZvbGRlcnMgPSBmYWxz ZTsKICAgICB9LAogCiAgICAgLy8gUHJvdGVjdGVkCkBAIC0xMDMsNyArMTA1LDcgQEAgV2ViSW5z cGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhp cy51cGRhdGVQYXJlbnRTdGF0dXMoKTsKIAotICAgICAgICBpZiAoIXRoaXMudHJlZU91dGxpbmUp IHsKKyAgICAgICAgaWYgKCF0aGlzLnRyZWVPdXRsaW5lICYmICF0aGlzLnBvcHVsYXRpbmcpIHsK ICAgICAgICAgICAgIC8vIEp1c3QgbWFyayBhcyBuZWVkaW5nIHRvIHVwZGF0ZSB0byBhdm9pZCBk b2luZyB3b3JrIHRoYXQgbWlnaHQgbm90IGJlIG5lZWRlZC4KICAgICAgICAgICAgIHRoaXMuc2hv dWxkUmVmcmVzaENoaWxkcmVuID0gdHJ1ZTsKICAgICAgICAgICAgIHJldHVybjsKQEAgLTExMiw3 ICsxMTQsOCBAQCBXZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKICAgICAgICAgaWYgKCF0aGlzLl9ncm91cGVkSW50b0ZvbGRlcnMgJiYgdGhpcy5fc2hvdWxk R3JvdXBJbnRvRm9sZGVycygpKSB7CiAgICAgICAgICAgICAvLyBNYXJrIGFzIG5lZWRpbmcgYSBy ZWZyZXNoIHRvIHJlYnVpbGQgdGhlIHRyZWUgaW50byBmb2xkZXJzLgogICAgICAgICAgICAgdGhp cy5fZ3JvdXBlZEludG9Gb2xkZXJzID0gdHJ1ZTsKLSAgICAgICAgICAgIHRoaXMuc2hvdWxkUmVm cmVzaENoaWxkcmVuID0gdHJ1ZTsKKyAgICAgICAgICAgIGlmICghdGhpcy5wb3B1bGF0aW5nKQor ICAgICAgICAgICAgICAgIHRoaXMuc2hvdWxkUmVmcmVzaENoaWxkcmVuID0gdHJ1ZTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVUcmVlRWxlbWVudC5qcwppbmRl eCBkMzc5N2ZjLi4yMTI3MWJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQuanMKQEAgLTIzMCw2 ICsyMzAsOCBAQCBXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIGlmICh0aGlzLmNoaWxkcmVuLmxlbmd0aCAmJiAhdGhpcy5zaG91bGRSZWZyZXNoQ2hp bGRyZW4pCiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgdGhpcy5wb3B1bGF0aW5nID0g dHJ1ZTsKKwogICAgICAgICB0aGlzLnNob3VsZFJlZnJlc2hDaGlsZHJlbiA9IGZhbHNlOwogCiAg ICAgICAgIHRoaXMucmVtb3ZlQ2hpbGRyZW4oKTsKQEAgLTI1MCw2ICsyNTIsOCBAQCBXZWJJbnNw ZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBmbG93TWFw ID0gdGhpcy5fZnJhbWUuZG9tVHJlZS5mbG93TWFwOwogICAgICAgICBmb3IgKHZhciBmbG93S2V5 IGluIGZsb3dNYXApCiAgICAgICAgICAgICB0aGlzLmFkZENoaWxkRm9yUmVwcmVzZW50ZWRPYmpl Y3QoZmxvd01hcFtmbG93S2V5XSk7CisKKyAgICAgICAgdGhpcy5wb3B1bGF0aW5nID0gZmFsc2U7 CiAgICAgfSwKIAogICAgIG9uZXhwYW5kOiBmdW5jdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsVHJlZUVsZW1lbnQuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsVHJlZUVs ZW1lbnQuanMKaW5kZXggYWZlZTVkOC4uMGZmM2UxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50LmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxUcmVlRWxl bWVudC5qcwpAQCAtNTIsNiArNTIsNyBAQCBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50 LkV2ZW50ID0gewogCiBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLkdlbmVyYWxUcmVlRWxlbWVudCwKKyAg ICBfX3Byb3RvX186IFRyZWVFbGVtZW50LnByb3RvdHlwZSwKIAogICAgIC8vIFB1YmxpYwogCkBA IC0zOTQsNSArMzk1LDMgQEAgV2ViSW5zcGVjdG9yLkdlbmVyYWxUcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9zdGF0dXNFbGVtZW50LnRleHRDb250ZW50ID0gdGhp cy5fc3RhdHVzOwogICAgIH0KIH07Ci0KLVdlYkluc3BlY3Rvci5HZW5lcmFsVHJlZUVsZW1lbnQu cHJvdG90eXBlLl9fcHJvdG9fXyA9IFRyZWVFbGVtZW50LnByb3RvdHlwZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVHJlZUVs ZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNv dXJjZVRyZWVFbGVtZW50LmpzCmluZGV4IGNlNTkyNTAuLjMwYzc1ZmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVHJlZUVsZW1l bnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVz b3VyY2VUcmVlRWxlbWVudC5qcwpAQCAtNzYsNiArNzYsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VUcmVlRWxlbWVudC5jb21wYXJlRm9sZGVyQW5kUmVzb3VyY2VUcmVlRWxlbWVudHMgPSBmdW5j dGlvbgogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAg ICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50LAorICAgIF9f cHJvdG9fXzogV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUcmVlRWxlbWVudC5wcm90b3R5cGUsCiAK ICAgICAvLyBQdWJsaWMKIApAQCAtMTk0LDUgKzE5NSwzIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJj ZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5jYWxsRmlyc3RBbmNlc3Rv ckZ1bmN0aW9uKCJkZXNjZW5kYW50UmVzb3VyY2VUcmVlRWxlbWVudFR5cGVEaWRDaGFuZ2UiLCBb dGhpcywgZXZlbnQuZGF0YS5vbGRUeXBlXSk7CiAgICAgfQogfTsKLQotV2ViSW5zcGVjdG9yLlJl c291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5Tb3Vy Y2VDb2RlVHJlZUVsZW1lbnQucHJvdG90eXBlOwo= 246786 2015-02-17 19:19:43 -0800 2022-03-01 02:48:06 -0800 [PATCH] Attempted fix 6. folders.diff text/plain 7888 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJkMmM2YWUuLjhkZjEzOTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE1LTAyLTE3ICBKb25vIFdlbGxzICA8 am9ub3dlbGxzQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnNwZWN0aW5n IGEgcGFnZSB3aGVyZSByZXNvdXJjZXMgYXJlIGluIGZvbGRlcnMgZm9yY2VzIGZvbGRlciBvcmdh bml6YXRpb24gb24gZXZlcnkgc3Vic2VxdWVudCBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEzOTcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHJlbW92ZUNoaWxkcmVuIGlzIGNhbGxlZCBv biBhbiBpbnN0YW5jZSBvZiBhIEZvbGRlcml6ZWRUcmVlRWxlbWVudCwgdGhlIGVsZW1lbnQncyBf Z3JvdXBlZEludG9Gb2xkZXJzIGZsYWcKKyAgICAgICAgd2lsbCBub3cgYmUgc2V0IHRvIGZhbHNl LiBUaGlzIHdpbGwgcHJldmVudCB1bm5lY2Vzc2FyeSBmb2xkZXJpemF0aW9uIHVwb24gYSBmcmFt ZSBuYXZpZ2F0aW9uLiBBbHNvIGR1cmluZyBhbgorICAgICAgICBvbnBvcHVsYXRlIGV2ZW50LCBh ZGRDaGlsZEZvclJlcHJlc2VudGVkT2JqZWN0IGlzIGNhbGxlZCByZXBlYXRlZGx5IGFuZCBtdWNo IG9mIHRoZSB3b3JrIGRvbmUgZHVyaW5nIGVhY2ggY2FsbAorICAgICAgICB3YXMgdW5uZWNlc3Nh cnkuIFRoYXQgd29yayBpcyBub3cgcmVsb2NhdGVkIGFuZCBjYWxsZWQgY29uZGl0aW9uYWxseSBv bmx5IGlmIGEgcG9wdWxhdGlvbiBpcyBhYm91dCB0byBvY2N1cgorICAgICAgICBvciBpZiBhZGRD aGlsZEZvclJlcHJlc2VudGVkT2JqZWN0IGlzIGJlaW5nIGNhbGxlZCBvdXRzaWRlIG9mIGEgcG9w dWxhdGUgZXZlbnQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRU cmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1l bnQucHJvdG90eXBlLnNldCByZW1vdmVDaGlsZHJlbik6IFNldCBfZ3JvdXBlZEludG9Gb2xkZXJz IHRvIGZhbHNlLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50 LnByb3RvdHlwZS5hZGRDaGlsZEZvclJlcHJlc2VudGVkT2JqZWN0KToKKyAgICAgICAgUmVtb3Zl IHdvcmsgdGhhdCBzaG91bGQgb25seSBiZSBkb25lIGVpdGhlciBkdXJpbmcgdGhlIGJlZ2lubmlu ZyBvZiBhbiBvbnBvcHVsYXRlIGV2ZW50IG9yIGR1cmluZyBhIG9uZS1vZmYKKyAgICAgICAgYWRk Q2hpbGRGb3JSZXByZXNlbnRlZE9iamVjdCBjYWxsLgorCisgICAgICAgIChXZWJJbnNwZWN0b3Iu Rm9sZGVyaXplZFRyZWVFbGVtZW50LnByb3RvdHlwZS5wcmVwYXJlVG9Qb3B1bGF0ZSk6IE5vdyBo YW5kbGVzIHdvcmsgYXQgYmVnaW5uaW5nIG9mIG9ucG9wdWxhdGUuCisKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQucHJvdG90eXBlLl9wb3B1bGF0ZUZyb21OZXdD aGlsZFF1ZXVlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQu cHJvdG90eXBlLl9zaG91bGRHcm91cEludG9Gb2xkZXJzKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQucHJvdG90eXBlLl9zaG91bGRTd2l0Y2hUb0ZvbGRlckdy b3Vwcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50LnByb3Rv dHlwZS5fc3dpdGNoVG9Gb2xkZXJHcm91cHNJZk5lY2Vzc2FyeSk6CisgICAgICAgIEJldHRlciBv cmdhbml6YXRpb24gb2YgY29kZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRnJh bWVUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50 LnByb3RvdHlwZS5vbnBvcHVsYXRlKTogQWRkIHBvcHVsYXRpbmcgZmxhZy4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50LmpzOiBEcml2ZS1ieSBpbmhl cml0YW5jZSBzdHlsZSBmaXguCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJj ZVRyZWVFbGVtZW50LmpzOiBEcml2ZS1ieSBpbmhlcml0YW5jZSBzdHlsZSBmaXguCisKIDIwMTUt MDItMTYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBFUzY6IEltcHJvdmVkIENvbnNvbGUgU3VwcG9ydCBmb3IgUHJvbWlzZSBP YmplY3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Gb2xkZXJpemVkVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Gb2xkZXJpemVkVHJlZUVsZW1lbnQuanMKaW5kZXggMGZlNjJhOC4u M2YwNDFmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRm9sZGVyaXplZFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRUcmVlRWxlbWVudC5qcwpAQCAtODgsNiAr ODgsOCBAQCBXZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIGZvbGRlci5yZW1vdmVDaGlsZHJlbigpOwogCiAgICAgICAgIHRoaXMuX2Zv bGRlclR5cGVNYXAuY2xlYXIoKTsKKworICAgICAgICB0aGlzLl9ncm91cGVkSW50b0ZvbGRlcnMg PSBmYWxzZTsKICAgICB9LAogCiAgICAgLy8gUHJvdGVjdGVkCkBAIC0xMDEsMTkgKzEwMywxMyBA QCBXZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMudXBkYXRlUGFyZW50U3Rh dHVzKCk7Ci0KLSAgICAgICAgaWYgKCF0aGlzLnRyZWVPdXRsaW5lKSB7Ci0gICAgICAgICAgICAv LyBKdXN0IG1hcmsgYXMgbmVlZGluZyB0byB1cGRhdGUgdG8gYXZvaWQgZG9pbmcgd29yayB0aGF0 IG1pZ2h0IG5vdCBiZSBuZWVkZWQuCi0gICAgICAgICAgICB0aGlzLnNob3VsZFJlZnJlc2hDaGls ZHJlbiA9IHRydWU7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBp ZiAoIXRoaXMuX2dyb3VwZWRJbnRvRm9sZGVycyAmJiB0aGlzLl9zaG91bGRHcm91cEludG9Gb2xk ZXJzKCkpIHsKLSAgICAgICAgICAgIC8vIE1hcmsgYXMgbmVlZGluZyBhIHJlZnJlc2ggdG8gcmVi dWlsZCB0aGUgdHJlZSBpbnRvIGZvbGRlcnMuCi0gICAgICAgICAgICB0aGlzLl9ncm91cGVkSW50 b0ZvbGRlcnMgPSB0cnVlOwotICAgICAgICAgICAgdGhpcy5zaG91bGRSZWZyZXNoQ2hpbGRyZW4g PSB0cnVlOwotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAoIXRoaXMucG9wdWxhdGlu ZykgeworICAgICAgICAgICAgaWYgKCF0aGlzLnRyZWVPdXRsaW5lKSB7CisgICAgICAgICAgICAg ICAgLy8gSnVzdCBtYXJrIGFzIG5lZWRpbmcgdG8gdXBkYXRlIHRvIGF2b2lkIGRvaW5nIHdvcmsg dGhhdCBtaWdodCBub3QgYmUgbmVlZGVkLgorICAgICAgICAgICAgICAgIHRoaXMuc2hvdWxkUmVm cmVzaENoaWxkcmVuID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICB9CisgICAgICAgICAgICB0aGlzLl9zd2l0Y2hUb0ZvbGRlckdyb3Vwc0lmTmVjZXNzYXJ5KCk7 CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgY2hpbGRUcmVlRWxlbWVudCA9IHRoaXMudHJlZU91 dGxpbmUuZ2V0Q2FjaGVkVHJlZUVsZW1lbnQocmVwcmVzZW50ZWRPYmplY3QpOwpAQCAtMTcyLDYg KzE2OCwxMiBAQCBXZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIHRoaXMucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICB9LAogCisgICAgcHJl cGFyZVRvUG9wdWxhdGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9zaG91 bGRTd2l0Y2hUb0ZvbGRlckdyb3VwcygpKQorICAgICAgICAgICAgdGhpcy5fZ3JvdXBlZEludG9G b2xkZXJzID0gdHJ1ZTsKKyAgICB9LAorCiAgICAgLy8gUHJpdmF0ZQogCiAgICAgX2NsZWFyTmV3 Q2hpbGRRdWV1ZTogZnVuY3Rpb24oKQpAQCAtMTkxLDYgKzE5Myw4IEBAIFdlYkluc3BlY3Rvci5G b2xkZXJpemVkVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAKKyAgICAgICAgdGhpcy5wcmVwYXJlVG9Qb3B1bGF0ZSgpOworCiAgICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fbmV3Q2hpbGRRdWV1ZS5sZW5ndGg7ICsraSkKICAg ICAgICAgICAgIHRoaXMuYWRkQ2hpbGRGb3JSZXByZXNlbnRlZE9iamVjdCh0aGlzLl9uZXdDaGls ZFF1ZXVlW2ldKTsKIApAQCAtMzYxLDUgKzM2NSwxOSBAQCBXZWJJbnNwZWN0b3IuRm9sZGVyaXpl ZFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICAgICAgfQogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfSwKKworICAgIF9zaG91bGRT d2l0Y2hUb0ZvbGRlckdyb3VwczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuICF0 aGlzLl9ncm91cGVkSW50b0ZvbGRlcnMgJiYgdGhpcy5fc2hvdWxkR3JvdXBJbnRvRm9sZGVycygp OworICAgIH0sCisKKyAgICBfc3dpdGNoVG9Gb2xkZXJHcm91cHNJZk5lY2Vzc2FyeTogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX3Nob3VsZFN3aXRjaFRvRm9sZGVyR3JvdXBz KCkpIHsKKyAgICAgICAgICAgIC8vIE1hcmsgYXMgbmVlZGluZyBhIHJlZnJlc2ggdG8gcmVidWls ZCB0aGUgdHJlZSBpbnRvIGZvbGRlcnMuCisgICAgICAgICAgICB0aGlzLl9ncm91cGVkSW50b0Zv bGRlcnMgPSB0cnVlOworICAgICAgICAgICAgdGhpcy5zaG91bGRSZWZyZXNoQ2hpbGRyZW4gPSB0 cnVlOworICAgICAgICB9CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVFbGVtZW50LmpzCmluZGV4 IGQzNzk3ZmMuLjYwMjc4MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVUcmVlRWxlbWVudC5qcwpAQCAtMjI5LDEw ICsyMjksMTIgQEAgV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewog ICAgIHsKICAgICAgICAgaWYgKHRoaXMuY2hpbGRyZW4ubGVuZ3RoICYmICF0aGlzLnNob3VsZFJl ZnJlc2hDaGlsZHJlbikKICAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICB0aGlzLnNob3Vs ZFJlZnJlc2hDaGlsZHJlbiA9IGZhbHNlOwogCiAgICAgICAgIHRoaXMucmVtb3ZlQ2hpbGRyZW4o KTsKKyAgICAgICAgdGhpcy51cGRhdGVQYXJlbnRTdGF0dXMoKTsKKyAgICAgICAgdGhpcy5wcmVw YXJlVG9Qb3B1bGF0ZSgpOworICAgICAgICB0aGlzLnBvcHVsYXRpbmcgPSB0cnVlOwogCiAgICAg ICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fZnJhbWUuY2hpbGRGcmFtZXMubGVuZ3RoOyAr K2kpCiAgICAgICAgICAgICB0aGlzLmFkZENoaWxkRm9yUmVwcmVzZW50ZWRPYmplY3QodGhpcy5f ZnJhbWUuY2hpbGRGcmFtZXNbaV0pOwpAQCAtMjUwLDYgKzI1Miw4IEBAIFdlYkluc3BlY3Rvci5G cmFtZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGZsb3dNYXAgPSB0aGlz Ll9mcmFtZS5kb21UcmVlLmZsb3dNYXA7CiAgICAgICAgIGZvciAodmFyIGZsb3dLZXkgaW4gZmxv d01hcCkKICAgICAgICAgICAgIHRoaXMuYWRkQ2hpbGRGb3JSZXByZXNlbnRlZE9iamVjdChmbG93 TWFwW2Zsb3dLZXldKTsKKworICAgICAgICB0aGlzLnBvcHVsYXRpbmcgPSBmYWxzZTsKICAgICB9 LAogCiAgICAgb25leHBhbmQ6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxUcmVlRWxlbWVudC5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxUcmVlRWxlbWVudC5q cwppbmRleCBhZmVlNWQ4Li4wZmYzZTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50Lmpz CkBAIC01Miw2ICs1Miw3IEBAIFdlYkluc3BlY3Rvci5HZW5lcmFsVHJlZUVsZW1lbnQuRXZlbnQg PSB7CiAKIFdlYkluc3BlY3Rvci5HZW5lcmFsVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAg IGNvbnN0cnVjdG9yOiBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50LAorICAgIF9fcHJv dG9fXzogVHJlZUVsZW1lbnQucHJvdG90eXBlLAogCiAgICAgLy8gUHVibGljCiAKQEAgLTM5NCw1 ICszOTUsMyBAQCBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIHRoaXMuX3N0YXR1c0VsZW1lbnQudGV4dENvbnRlbnQgPSB0aGlzLl9zdGF0 dXM7CiAgICAgfQogfTsKLQotV2ViSW5zcGVjdG9yLkdlbmVyYWxUcmVlRWxlbWVudC5wcm90b3R5 cGUuX19wcm90b19fID0gVHJlZUVsZW1lbnQucHJvdG90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUcmVlRWxlbWVudC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVHJl ZUVsZW1lbnQuanMKaW5kZXggY2U1OTI1MC4uMzBjNzVmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUcmVlRWxlbWVudC5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRy ZWVFbGVtZW50LmpzCkBAIC03Niw2ICs3Niw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVF bGVtZW50LmNvbXBhcmVGb2xkZXJBbmRSZXNvdXJjZVRyZWVFbGVtZW50cyA9IGZ1bmN0aW9uCiAK IFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICBjb25z dHJ1Y3RvcjogV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUVsZW1lbnQsCisgICAgX19wcm90b19f OiBXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRyZWVFbGVtZW50LnByb3RvdHlwZSwKIAogICAgIC8v IFB1YmxpYwogCkBAIC0xOTQsNSArMTk1LDMgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUVs ZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmNhbGxGaXJzdEFuY2VzdG9yRnVuY3Rp b24oImRlc2NlbmRhbnRSZXNvdXJjZVRyZWVFbGVtZW50VHlwZURpZENoYW5nZSIsIFt0aGlzLCBl dmVudC5kYXRhLm9sZFR5cGVdKTsKICAgICB9CiB9OwotCi1XZWJJbnNwZWN0b3IuUmVzb3VyY2VU cmVlRWxlbWVudC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVU cmVlRWxlbWVudC5wcm90b3R5cGU7Cg==