From 627fd08ea5eaca78c325ee149993e7067c2bb768 Mon Sep 17 00:00:00 2001
From: "smfr%smfr.org" <smfr%smfr.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 28 Jun 2005 03:43:09 +0000
Subject: [PATCH] Fix bug 298291: url bar not updated after navigating to
 relative anchor. Remove over-zealous null check on the nsIRequest, which is
 null in this case.

git-svn-id: svn://10.0.0.236/trunk@175196 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/camino/src/embedding/CHBrowserListener.mm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mozilla/camino/src/embedding/CHBrowserListener.mm b/mozilla/camino/src/embedding/CHBrowserListener.mm
index ecc53310cea..45f2596a136 100644
--- a/mozilla/camino/src/embedding/CHBrowserListener.mm
+++ b/mozilla/camino/src/embedding/CHBrowserListener.mm
@@ -600,7 +600,7 @@ NS_IMETHODIMP
 CHBrowserListener::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, 
                                           nsIURI *aLocation)
 {
-  if (!aLocation || !aWebProgress || !aRequest)
+  if (!aLocation || !aWebProgress)
     return NS_ERROR_FAILURE;
 
   // only pay attention to location change for our nsIDOMWindow
@@ -610,9 +610,13 @@ CHBrowserListener::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aR
   if (windowForProgress != ourWindow)
     return NS_OK;
 
-  nsresult requestStatus = NS_OK;
-  aRequest->GetStatus(&requestStatus);
-  BOOL requestOK = NS_SUCCEEDED(requestStatus);
+  BOOL requestOK = YES;
+  if (aRequest)  // aRequest can be null (e.g. for relative anchors)
+  {
+    nsresult requestStatus = NS_OK;
+    aRequest->GetStatus(&requestStatus);
+    requestOK = NS_SUCCEEDED(requestStatus);
+  }
   
   nsCAutoString spec;
   aLocation->GetSpec(spec);