Fixing an issue where embedded files were read from the wrong assembly

ravendb · Oct 28, 2010 · dfa78b4 · dfa78b4
1 parent ffc6fe9
commit dfa78b4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/Raven.Http/Extensions/HttpExtensions.cs b/Raven.Http/Extensions/HttpExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.IO;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
@@ -308,7 +309,7 @@ public static bool MatchEtag(this IHttpContext context, Guid etag)
 			return context.Request.Headers["If-None-Match"] == etag.ToString();
 		}
 
-		public static void WriteEmbeddedFile(this IHttpContext context, string ravenPath, string docPath)
+		public static void WriteEmbeddedFile(this IHttpContext context, Assembly asm, string ravenPath, string docPath)
 		{
 			var filePath = Path.Combine(ravenPath, docPath);
 			byte[] bytes;
@@ -322,7 +323,7 @@ public static void WriteEmbeddedFile(this IHttpContext context, string ravenPath
 					return;
 				}
 				string resourceName = "Raven.Database.Server.WebUI." + docPath.Replace("/", "."); 
-				using (var resource = typeof(HttpExtensions).Assembly.GetManifestResourceStream(resourceName))
+				using (var resource = asm.GetManifestResourceStream(resourceName))
 				{
 					if (resource == null)
 					{

diff --git a/Raven.Http/Responders/Favicon.cs b/Raven.Http/Responders/Favicon.cs
@@ -3,22 +3,22 @@
 
 namespace Raven.Http.Responders
 {
-	public class Favicon : AbstractRequestResponder
-	{
-		public override string UrlPattern
-		{
-			get { return "^/favicon.ico$"; }
-		}
+    public class Favicon : AbstractRequestResponder
+    {
+        public override string UrlPattern
+        {
+            get { return "^/favicon.ico$"; }
+        }
 
-		public override string[] SupportedVerbs
-		{
-			get { return new[] {"GET"}; }
-		}
+        public override string[] SupportedVerbs
+        {
+            get { return new[] { "GET" }; }
+        }
 
-		public override void Respond(IHttpContext context)
-		{
-			context.WriteEmbeddedFile(Settings.WebDir,"favicon.ico");
-		}
+        public override void Respond(IHttpContext context)
+        {
+            context.WriteEmbeddedFile(ResourceStore.GetType().Assembly, Settings.WebDir, "favicon.ico");
+        }
 
         public override bool IsUserInterfaceRequest
         {
@@ -27,5 +27,5 @@ public override bool IsUserInterfaceRequest
                 return true;
             }
         }
-	}
+    }
 }
diff --git a/Raven.Http/Responders/RavenUI.cs b/Raven.Http/Responders/RavenUI.cs
@@ -26,7 +26,7 @@ public override string[] SupportedVerbs
 		public override void Respond(IHttpContext context)
 		{
 			var docPath = context.GetRequestUrl().Replace("/raven/", "");
-			context.WriteEmbeddedFile(Settings.WebDir, docPath);
+			context.WriteEmbeddedFile(ResourceStore.GetType().Assembly,Settings.WebDir, docPath);
 		}