Couple workarounds for OE refresh issues on RHEL (#365)

This commit is contained in:
Karl Burtram
2017-05-29 16:36:55 -07:00
committed by GitHub
parent 5f4ab5eba8
commit 79350e10f9
2 changed files with 13 additions and 10 deletions

View File

@@ -149,14 +149,17 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
protected IEnumerable<T> GetSmoCollectionResult<T>(HashSet<string> urns, SmoCollectionBase retValue, SqlSmoObject parent) where T : SqlSmoObject protected IEnumerable<T> GetSmoCollectionResult<T>(HashSet<string> urns, SmoCollectionBase retValue, SqlSmoObject parent) where T : SqlSmoObject
{ {
if (urns != null) // the below code is filtering out tables on helsinki system
{ return new SmoCollectionWrapper<T>(retValue);
return new SmoCollectionWrapper<T>(retValue).Where(c => PassesFinalFilters(parent, c) && urns.Contains(c.Urn));
} // if (urns != null)
else // {
{ // return new SmoCollectionWrapper<T>(retValue).Where(c => PassesFinalFilters(parent, c) && urns.Contains(c.Urn));
return new SmoCollectionWrapper<T>(retValue).Where(c => PassesFinalFilters(parent, c)); // }
} // else
// {
// return new SmoCollectionWrapper<T>(retValue).Where(c => PassesFinalFilters(parent, c));
// }
} }
} }

View File

@@ -10,8 +10,8 @@ namespace Microsoft.SqlTools.ServiceLayer.SqlContext
/// </summary> /// </summary>
public class ObjectExplorerSettings public class ObjectExplorerSettings
{ {
public static int DefaultCreateSessionTimeout = 10; public static int DefaultCreateSessionTimeout = 300;
public static int DefaultExpandTimeout = 10; public static int DefaultExpandTimeout = 300;
public ObjectExplorerSettings() public ObjectExplorerSettings()
{ {