Merge branch 'release/1.0.1'

michaelJustin · Jul 15, 2016 · 19c5b57 · 19c5b57
2 parents f77c458 + a0c60fe
commit 19c5b57
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/src/main/djLoggerFactory.pas b/src/main/djLoggerFactory.pas
@@ -34,7 +34,7 @@ implementation
 
 uses
   NOPLogger,
-  SysUtils;
+  SysUtils, SyncObjs;
 
 resourcestring
   SLF4PTag = 'SLF4P: ';
@@ -44,17 +44,24 @@ implementation
 
 var
   LoggerFactory: ILoggerFactory;
+  CriticalSection: TCriticalSection;
 
 procedure RegisterFactory(const AFactory: ILoggerFactory);
 begin
   Assert(Assigned(AFactory));
 
-  if Assigned(LoggerFactory) then
-  begin
-    WriteLn(SLF4PTag + WarnOverwrite);
-  end;
+  CriticalSection.Enter;
+  try
+    if Assigned(LoggerFactory) then
+    begin
+      WriteLn(SLF4PTag + WarnOverwrite);
+    end;
+
+    LoggerFactory := AFactory;
 
-  LoggerFactory := AFactory;
+  finally
+    CriticalSection.Leave;
+  end;
 end;
 
 { TdjLoggerFactory }
@@ -76,4 +83,10 @@ class function TdjLoggerFactory.GetLogger(const AName: string): ILogger;
   Result := LoggerFactory.GetLogger(AName);
 end;
 
+initialization
+  CriticalSection := TCriticalSection.Create;
+
+finalization
+  CriticalSection.Free;
+
 end.