svn commit: r106320 - /httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h

[wrowe]

Author: wrowe
Date: Tue Nov 23 09:50:02 2004
New Revision: 106320

Modified:
   httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h
Log:

  Clean up the only compile emit, and in the process create two
  different warnings depending on which step fails.


Modified: httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h
Url: 
http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h?view=diff&rev=106320&p1=httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h&r1=106319&p2=httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h&r2=106320
==============================================================================
--- httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h  (original)
+++ httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h  Tue Nov 23 09:50:02 2004
@@ -238,9 +238,19 @@
                     }
                 }
                 if (obj == NULL) {
-                    if (!ConnectHost(HostKey) || !(obj = 
hostObj->get_Item(HostKey))) {
+                    if (!ConnectHost(HostKey)) {
                         Threading::Monitor::Exit(this);
-                        msg = String::Concat(L"Mount failure restarting host ",
+                        msg = String::Concat(L"Mount failed to connect 
restarting host ",
+                                   
__try_cast<String*>(hostURI->get_Item(HostKey)),
+                                             L" mapped to ",
+                                   
__try_cast<String*>(hostDir->get_Item(HostKey)));                               
                 
+                        LogServerError(msg, APLOG_ERR, 0, rr->server);
+                        return 500;
+                    }
+                    obj = hostObj->get_Item(HostKey);
+                    if (!obj) {
+                        Threading::Monitor::Exit(this);
+                        msg = String::Concat(L"Mount failed to query 
restarting host ",
                                    
__try_cast<String*>(hostURI->get_Item(HostKey)),
                                              L" mapped to ",
                                    
__try_cast<String*>(hostDir->get_Item(HostKey)));