summaryrefslogtreecommitdiff
path: root/gnu/java/net
diff options
context:
space:
mode:
authorChris Burdess <dog@bluezoo.org>2005-07-07 06:29:30 +0000
committerChris Burdess <dog@bluezoo.org>2005-07-07 06:29:30 +0000
commitef4496bf75cd0c8196b075d24b93e87384cb5d33 (patch)
treecae2b513086aaa5f4f61c1dc741aa3fa2b9425d3 /gnu/java/net
parentc73739cfe3afe415bb0a68ff44c34cdffd0e8463 (diff)
downloadclasspath-ef4496bf75cd0c8196b075d24b93e87384cb5d33.tar.gz
2005-07-06 Chris Burdess <dog@gnu.org>
* gnu/java/net/protocol/http/HTTPConnection.java, gnu/java/net/protocol/http/HTTPURLConnection.java: Fix bug with multiple threads and persistent connections.
Diffstat (limited to 'gnu/java/net')
-rw-r--r--gnu/java/net/protocol/http/HTTPConnection.java8
-rw-r--r--gnu/java/net/protocol/http/HTTPURLConnection.java2
2 files changed, 6 insertions, 4 deletions
diff --git a/gnu/java/net/protocol/http/HTTPConnection.java b/gnu/java/net/protocol/http/HTTPConnection.java
index 221733dba..6d9f447a2 100644
--- a/gnu/java/net/protocol/http/HTTPConnection.java
+++ b/gnu/java/net/protocol/http/HTTPConnection.java
@@ -402,7 +402,7 @@ public class HTTPConnection
* Retrieves the socket associated with this connection.
* This creates the socket if necessary.
*/
- protected Socket getSocket()
+ protected synchronized Socket getSocket()
throws IOException
{
if (socket == null)
@@ -489,7 +489,7 @@ public class HTTPConnection
sslSocketFactory = factory;
}
- protected InputStream getInputStream()
+ protected synchronized InputStream getInputStream()
throws IOException
{
if (socket == null)
@@ -499,7 +499,7 @@ public class HTTPConnection
return in;
}
- protected OutputStream getOutputStream()
+ protected synchronized OutputStream getOutputStream()
throws IOException
{
if (socket == null)
@@ -512,7 +512,7 @@ public class HTTPConnection
/**
* Closes the underlying socket, if any.
*/
- protected void closeConnection()
+ protected synchronized void closeConnection()
throws IOException
{
if (socket != null)
diff --git a/gnu/java/net/protocol/http/HTTPURLConnection.java b/gnu/java/net/protocol/http/HTTPURLConnection.java
index 770029f19..fb37fbc06 100644
--- a/gnu/java/net/protocol/http/HTTPURLConnection.java
+++ b/gnu/java/net/protocol/http/HTTPURLConnection.java
@@ -328,6 +328,8 @@ public class HTTPURLConnection
if (keepAlive)
{
StringBuffer buf = new StringBuffer(secure ? "https://" : "http://");
+ buf.append(Thread.currentThread().hashCode());
+ buf.append('@');
buf.append(host);
buf.append(':');
buf.append(port);