Error handling

mbrit · Dec 8, 2011 · 56c2b2f · 56c2b2f
1 parent b7fb987
commit 56c2b2f
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/Raven.Database/Server/HttpServer.cs b/Raven.Database/Server/HttpServer.cs
@@ -487,9 +487,16 @@ private bool DispatchRequest(IHttpContext ctx)
 			}
 			finally
 			{
-				CurrentOperationContext.Headers.Value = new NameValueCollection();
-				currentDatabase.Value = DefaultResourceStore;
-				currentConfiguration.Value = DefaultConfiguration;
+				try
+				{
+					CurrentOperationContext.Headers.Value = new NameValueCollection();
+					currentDatabase.Value = DefaultResourceStore;
+					currentConfiguration.Value = DefaultConfiguration;
+				}
+				catch 
+				{
+					// this can happen during system shutdown
+				}
 			}
 			return false;
 		}