cleanup

aspnet · Mar 10, 2016 · dcd2035 · dcd2035
1 parent 8dabab9
commit dcd2035
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
@@ -225,16 +225,18 @@ private string ResolveApplicationBasePath(string applicationBasePath, string bas
         {
             if (_startup != null)
             {
-                var startupAssemblyLocation = Path.GetDirectoryName(_startup.ConfigureDelegate.Target.GetType().GetTypeInfo().Assembly.Location);
-                if (startupAssemblyLocation != null) {
-                    return startupAssemblyLocation;
+                var startupAssemblyLocation = _startup.ConfigureDelegate.Target.GetType().GetTypeInfo().Assembly.Location;
+                if (!string.IsNullOrEmpty(startupAssemblyLocation))
+                {
+                    return Path.GetDirectoryName(startupAssemblyLocation);
                 }
             }
             else if (_startupType != null)
             {
-               var startupAssemblyLocation = Path.GetDirectoryName(_startupType.GetTypeInfo().Assembly.Location);
-               if (startupAssemblyLocation != null) {
-                    return startupAssemblyLocation;
+                var startupAssemblyLocation = _startupType.GetTypeInfo().Assembly.Location;
+                if (!string.IsNullOrEmpty(startupAssemblyLocation)) 
+                {
+                    return Path.GetDirectoryName(startupAssemblyLocation);
                 }
             }