From f82c91fd020f429c53a02808f4c72cc0c3ca5ac0 Mon Sep 17 00:00:00 2001
From: "warren%netscape.com"
 <warren%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 24 Aug 2000 22:35:46 +0000
Subject: [PATCH] Changed to not add to load group on OpenInputStream

git-svn-id: svn://10.0.0.236/trunk@77123 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/libjar/nsJARChannel.cpp       | 42 ++++++++++---------
 .../netwerk/protocol/jar/src/nsJARChannel.cpp | 42 ++++++++++---------
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/mozilla/modules/libjar/nsJARChannel.cpp b/mozilla/modules/libjar/nsJARChannel.cpp
index 49d1346fef7..3822c14fcfd 100644
--- a/mozilla/modules/libjar/nsJARChannel.cpp
+++ b/mozilla/modules/libjar/nsJARChannel.cpp
@@ -371,8 +371,30 @@ ReadJARElement(nsJARChannel* jarChannel, void* closure)
 NS_IMETHODIMP
 nsJARChannel::AsyncRead(nsIStreamListener* listener, nsISupports* ctxt)
 {
+    nsresult rv;
     mUserContext = ctxt;
     mUserListener = listener;
+
+    if (mLoadGroup) {
+        if (mUserListener) {
+            nsCOMPtr<nsILoadGroupListenerFactory> factory;
+            //
+            // Create a load group "proxy" listener...
+            //
+            rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
+            if (factory) {
+                nsIStreamListener *newListener;
+                rv = factory->CreateLoadGroupListener(mUserListener, &newListener);
+                if (NS_SUCCEEDED(rv)) {
+                    mUserListener = newListener;
+                    NS_RELEASE(newListener);
+                }
+            }
+        }
+        rv = mLoadGroup->AddChannel(this, nsnull);
+        if (NS_FAILED(rv)) return rv;
+    }
+
     return EnsureJARFileAvailable(ReadJARElement, nsnull);
 }
 
@@ -405,26 +427,6 @@ nsJARChannel::EnsureJARFileAvailable(OnJARFileAvailableFun onJARFileAvailable,
            ("nsJarProtocol: EnsureJARFileAvailable %s", (const char*)jarURLStr));
 #endif
 
-    if (mLoadGroup) {
-        if (mUserListener) {
-            nsCOMPtr<nsILoadGroupListenerFactory> factory;
-            //
-            // Create a load group "proxy" listener...
-            //
-            rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
-            if (factory) {
-                nsIStreamListener *newListener;
-                rv = factory->CreateLoadGroupListener(mUserListener, &newListener);
-                if (NS_SUCCEEDED(rv)) {
-                    mUserListener = newListener;
-                    NS_RELEASE(newListener);
-                }
-            }
-        }
-        rv = mLoadGroup->AddChannel(this, nsnull);
-        if (NS_FAILED(rv)) return rv;
-    }
-
     rv = mURI->GetJARFile(getter_AddRefs(mJARBaseURI));
     if (NS_FAILED(rv)) goto error;
 
diff --git a/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp b/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp
index 49d1346fef7..3822c14fcfd 100644
--- a/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp
+++ b/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp
@@ -371,8 +371,30 @@ ReadJARElement(nsJARChannel* jarChannel, void* closure)
 NS_IMETHODIMP
 nsJARChannel::AsyncRead(nsIStreamListener* listener, nsISupports* ctxt)
 {
+    nsresult rv;
     mUserContext = ctxt;
     mUserListener = listener;
+
+    if (mLoadGroup) {
+        if (mUserListener) {
+            nsCOMPtr<nsILoadGroupListenerFactory> factory;
+            //
+            // Create a load group "proxy" listener...
+            //
+            rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
+            if (factory) {
+                nsIStreamListener *newListener;
+                rv = factory->CreateLoadGroupListener(mUserListener, &newListener);
+                if (NS_SUCCEEDED(rv)) {
+                    mUserListener = newListener;
+                    NS_RELEASE(newListener);
+                }
+            }
+        }
+        rv = mLoadGroup->AddChannel(this, nsnull);
+        if (NS_FAILED(rv)) return rv;
+    }
+
     return EnsureJARFileAvailable(ReadJARElement, nsnull);
 }
 
@@ -405,26 +427,6 @@ nsJARChannel::EnsureJARFileAvailable(OnJARFileAvailableFun onJARFileAvailable,
            ("nsJarProtocol: EnsureJARFileAvailable %s", (const char*)jarURLStr));
 #endif
 
-    if (mLoadGroup) {
-        if (mUserListener) {
-            nsCOMPtr<nsILoadGroupListenerFactory> factory;
-            //
-            // Create a load group "proxy" listener...
-            //
-            rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
-            if (factory) {
-                nsIStreamListener *newListener;
-                rv = factory->CreateLoadGroupListener(mUserListener, &newListener);
-                if (NS_SUCCEEDED(rv)) {
-                    mUserListener = newListener;
-                    NS_RELEASE(newListener);
-                }
-            }
-        }
-        rv = mLoadGroup->AddChannel(this, nsnull);
-        if (NS_FAILED(rv)) return rv;
-    }
-
     rv = mURI->GetJARFile(getter_AddRefs(mJARBaseURI));
     if (NS_FAILED(rv)) goto error;