add check

pomma89 · Jun 29, 2017 · 8aa2562 · 8aa2562
1 parent 5026f22
commit 8aa2562
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/CodeProject.ObjectPool/ObjectPool.cs b/src/CodeProject.ObjectPool/ObjectPool.cs
@@ -171,7 +171,7 @@ public int MaximumPoolSize
         /// <param name="config"></param>
         protected void StartEvictor(EvictionConfig config)
         {
-            if (this._timer != null && config.Enable)
+            if (config != null && this._timer != null && config.Enable)
             {
                 this._timer.Schedule(
                     () =>

diff --git a/src/CodeProject.ObjectPool/PooledObject.cs b/src/CodeProject.ObjectPool/PooledObject.cs
@@ -69,6 +69,7 @@ internal bool ValidateObject(PooledObjectValidationContext validationContext)
                     {
                         this.PooledObjectInfo.State = PooledObjectState.ValidateFail;
                     }
+                    return verifyResult;
                 }
                 catch (Exception ex)
                 {
-Original file line number
+Diff line change
@@ Expand Up @@
                         {
                             this.PooledObjectInfo.State = PooledObjectState.ValidateFail;
                         }
+                        return verifyResult;
                     }
                     catch (Exception ex)
                     {
@@ Expand Down @@