From d5517979e2786cb1ff91a0fe9811bc13dfdf24d8 Mon Sep 17 00:00:00 2001
From: "warren%netscape.com"
 <warren%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 31 Jul 1999 07:30:49 +0000
Subject: [PATCH] Removed nsCOMPtr breakage.

git-svn-id: svn://10.0.0.236/trunk@41697 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../netwerk/base/src/nsInputStreamChannel.cpp    | 16 ++++++++++++----
 mozilla/netwerk/base/src/nsInputStreamChannel.h  |  9 ++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/mozilla/netwerk/base/src/nsInputStreamChannel.cpp b/mozilla/netwerk/base/src/nsInputStreamChannel.cpp
index 101a91574a7..4da42177bd7 100644
--- a/mozilla/netwerk/base/src/nsInputStreamChannel.cpp
+++ b/mozilla/netwerk/base/src/nsInputStreamChannel.cpp
@@ -19,19 +19,23 @@
 #include "nsInputStreamChannel.h"
 #include "nsIStreamListener.h"
 #include "nsILoadGroup.h"
+#include "nsCOMPtr.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsInputStreamChannel methods:
 
 nsInputStreamChannel::nsInputStreamChannel()
-    : mContentType(nsnull)
+    : mURI(nsnull), mContentType(nsnull), mInputStream(nsnull), mLoadGroup(nsnull)
 {
     NS_INIT_REFCNT(); 
 }
 
 nsInputStreamChannel::~nsInputStreamChannel()
 {
+    NS_IF_RELEASE(mURI);
     if (mContentType) nsCRT::free(mContentType);
+    NS_IF_RELEASE(mInputStream);
+    NS_IF_RELEASE(mLoadGroup);
 }
 
 NS_METHOD
@@ -51,11 +55,13 @@ nsresult
 nsInputStreamChannel::Init(nsIURI* uri, const char* contentType,
                            nsIInputStream* in)
 {
-    mURI = uri; // addrefs
+    mURI = uri;
+    NS_IF_ADDREF(mURI);
     mContentType = nsCRT::strdup(contentType);
     if (mContentType == nsnull)
         return NS_ERROR_OUT_OF_MEMORY;
-    mInputStream = in;  // addrefs
+    mInputStream = in;
+    NS_IF_ADDREF(mInputStream);
     return NS_OK;
 }
 
@@ -193,7 +199,9 @@ nsInputStreamChannel::GetLoadGroup(nsILoadGroup * *aLoadGroup)
 NS_IMETHODIMP
 nsInputStreamChannel::SetLoadGroup(nsILoadGroup * aLoadGroup)
 {
-    mLoadGroup = aLoadGroup;    // releases and addrefs
+    NS_IF_RELEASE(mLoadGroup);
+    mLoadGroup = aLoadGroup;
+    NS_IF_ADDREF(mLoadGroup);
     return NS_OK;
 }
 
diff --git a/mozilla/netwerk/base/src/nsInputStreamChannel.h b/mozilla/netwerk/base/src/nsInputStreamChannel.h
index bf1814e9ace..bb04d9fd2c5 100644
--- a/mozilla/netwerk/base/src/nsInputStreamChannel.h
+++ b/mozilla/netwerk/base/src/nsInputStreamChannel.h
@@ -23,7 +23,6 @@
 #include "nsIInputStream.h"
 #include "nsIURI.h"
 #include "nsCRT.h"
-#include "nsCOMPtr.h"
 
 class nsInputStreamChannel : public nsIChannel
 {
@@ -62,10 +61,10 @@ public:
     nsresult Init(nsIURI* uri, const char* contentType, nsIInputStream* in);
 
 protected:
-    nsCOMPtr<nsIURI>            mURI;
-    char*                       mContentType;
-    nsCOMPtr<nsIInputStream>    mInputStream;
-    nsCOMPtr<nsILoadGroup>      mLoadGroup;
+    nsIURI*             mURI;
+    char*               mContentType;
+    nsIInputStream*     mInputStream;
+    nsILoadGroup*       mLoadGroup;
 };
 
 #define NS_INPUTSTREAMCHANNEL_CID                    \