Skip to content

Commit 57f29c4

Browse files
author
claudiamurialdo
committed
Reuse External Provider Instances
(cherry picked from commit 276bb93) # Conflicts: # dotnet/src/dotnetframework/GxClasses/Configuration/ExternalStorage.cs # dotnet/src/dotnetframework/GxClasses/Services/Storage/GXServices.cs
1 parent 295e7aa commit 57f29c4

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

dotnet/src/dotnetframework/GxClasses/Configuration/ExternalStorage.cs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public bool Create(string name, GXProperties initialProperties, ref GxStoragePro
5454

5555
if (lazyProvider.IsValueCreated)
5656
{
57-
GXLogging.Debug(logger, $"Using cached storage provider for key: {cacheKey}");
57+
GXLogging.Debug(logger, $"Using cached storage provider for key: {cacheKey}");
5858
}
5959
else
6060
{
@@ -103,11 +103,7 @@ private ExternalStorage CreateProvider(string name, GXProperties initialProperti
103103
}
104104

105105
string typeFullName = providerService.ClassName;
106-
string fullStack = Environment.StackTrace;
107-
int index = fullStack.IndexOf("GeneXus.Application.GxRestWrapper", StringComparison.OrdinalIgnoreCase);
108-
if (index > 0) fullStack = fullStack.Substring(0, index);
109-
110-
GXLogging.Debug(logger, "Loading storage provider from Create: " + typeFullName, fullStack);
106+
GXLogging.Debug(logger, "Loading storage provider from Create: " + typeFullName);
111107

112108
#if !NETCORE
113109
Type type = Type.GetType(typeFullName, true, true);
@@ -119,7 +115,7 @@ private ExternalStorage CreateProvider(string name, GXProperties initialProperti
119115

120116
GXLogging.Debug(logger, "Loading storage provider ended.");
121117

122-
return this;
118+
return this;
123119
}
124120

125121
private string GenerateCacheKey(string name, GXProperties properties)
@@ -174,7 +170,7 @@ private void preprocess(String name, GXProperties properties)
174170
SetEncryptedProperty(properties, "ACCOUNT_NAME");
175171
SetEncryptedProperty(properties, "ACCESS_KEY");
176172
break;
177-
173+
178174
//case "BOX":
179175
// className = "{class}";
180176
// break;
@@ -234,4 +230,4 @@ private void SetEncryptedProperty(GXProperties properties, String prop)
234230
/*
235231
TODO:
236232
+ Provider's libraries (dll) must be manually copied from '{gx}/Services/Storage/{provider}/*.dll' to '{webapp}/web/bin'
237-
*/
233+
*/

dotnet/src/dotnetframework/GxClasses/Services/Storage/GXServices.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Diagnostics;
43
using System.IO;
54
using GeneXus.Application;
65
using GeneXus.Utils;
@@ -206,7 +205,7 @@ public static ExternalProvider GetExternalProvider()
206205
public static void SetExternalProvider(ExternalProvider provider)
207206
{
208207
externalProvider = provider;
209-
GXLogging.Debug(log, "SetExternalProvider null?: " + (provider==null));
208+
GXLogging.Debug(log, "SetExternalProvider null?: " + (provider == null));
210209
}
211210

212211
public static ExternalProvider GetExternalProviderImpl(string service)
@@ -220,13 +219,7 @@ public static ExternalProvider GetExternalProviderImpl(string service)
220219
try
221220
{
222221
string typeFullName = providerService.ClassName;
223-
224-
string fullStack = Environment.StackTrace;
225-
int index = fullStack.IndexOf("GeneXus.Application.GxRestWrapper", StringComparison.OrdinalIgnoreCase);
226-
if (index > 0) fullStack = fullStack.Substring(0, index);
227-
228-
229-
GXLogging.Debug(log, "Loading storage provider from ServiceFactory:", typeFullName, fullStack);
222+
GXLogging.Debug(log, "Loading storage provider from ServiceFactory:", typeFullName);
230223
#if !NETCORE
231224
Type type = Type.GetType(typeFullName, true, true);
232225
#else

0 commit comments

Comments
 (0)