From 028ecead8e1323b4d0161a2e7212ef06f0bd9926 Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com" <alecf%netscape.com>
Date: Wed, 3 Nov 1999 01:38:54 +0000
Subject: [PATCH] fix message datasource so it doesn't return an error back to
 RDF partial fix for #17811 r=putterman

---
 mailnews/base/src/nsMsgMessageDataSource.cpp | 55 +++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/mailnews/base/src/nsMsgMessageDataSource.cpp b/mailnews/base/src/nsMsgMessageDataSource.cpp
index c1f9f2ebf270..33b45b1ea626 100644
--- a/mailnews/base/src/nsMsgMessageDataSource.cpp
+++ b/mailnews/base/src/nsMsgMessageDataSource.cpp
@@ -629,32 +629,37 @@ nsMsgMessageDataSource::createMessageNode(nsIMessage *message,
                                          nsIRDFResource *property,
                                          nsIRDFNode **target)
 {
-	if (kNC_SubjectCollation == property)
-		return createMessageNameNode(message, PR_TRUE, target);
-	else if (kNC_Subject == property)
-		return createMessageNameNode(message, PR_FALSE, target);
-	else if (kNC_SenderCollation == property)
-		return createMessageSenderNode(message, PR_TRUE, target);
-	else if (kNC_Sender == property)
-		return createMessageSenderNode(message, PR_FALSE, target);
-	else if ((kNC_Date == property))
-		return createMessageDateNode(message, target);
-	else if ((kNC_Status == property))
-		return createMessageStatusNode(message, target);
-	else if ((kNC_Flagged == property))
-		return createMessageFlaggedNode(message, target);
-	else if ((kNC_Priority == property))
-		return createMessagePriorityNode(message, target);
-	else if ((kNC_Size == property))
-		return createMessageSizeNode(message, target);
-	else if (( kNC_Total == property))
-		return createMessageTotalNode(message, target);
-	else if ((kNC_Unread == property))
-		return createMessageUnreadNode(message, target);
-  else if ((kNC_MessageChild == property))
-    return createMessageMessageChildNode(message, target);
+  nsresult rv = NS_RDF_NO_VALUE;
   
-	return NS_RDF_NO_VALUE;
+	if (kNC_SubjectCollation == property)
+		rv = createMessageNameNode(message, PR_TRUE, target);
+	else if (kNC_Subject == property)
+		rv = createMessageNameNode(message, PR_FALSE, target);
+	else if (kNC_SenderCollation == property)
+		rv = createMessageSenderNode(message, PR_TRUE, target);
+	else if (kNC_Sender == property)
+		rv = createMessageSenderNode(message, PR_FALSE, target);
+	else if ((kNC_Date == property))
+		rv = createMessageDateNode(message, target);
+	else if ((kNC_Status == property))
+		rv = createMessageStatusNode(message, target);
+	else if ((kNC_Flagged == property))
+		rv = createMessageFlaggedNode(message, target);
+	else if ((kNC_Priority == property))
+		rv = createMessagePriorityNode(message, target);
+	else if ((kNC_Size == property))
+		rv = createMessageSizeNode(message, target);
+	else if (( kNC_Total == property))
+		rv = createMessageTotalNode(message, target);
+	else if ((kNC_Unread == property))
+		rv = createMessageUnreadNode(message, target);
+  else if ((kNC_MessageChild == property))
+    rv = createMessageMessageChildNode(message, target);
+
+  if (NS_FAILED(rv))
+    return NS_RDF_NO_VALUE;
+
+  return NS_OK;
 }