Set peer for new SSLSessionImpl instances.
Bug: http://code.google.com/p/android/issues/detail?id=4914
diff --git a/libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java b/libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
index b488a0e..34252f0 100644
--- a/libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
+++ b/libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
@@ -88,6 +88,7 @@
} else if (parameters.getEnableSessionCreation()){
isResuming = false;
session = new SSLSessionImpl(parameters.getSecureRandom());
+ session.setPeer(engineOwner.getPeerHost(), engineOwner.getPeerPort());
session.protocol = ProtocolVersion.getLatestVersion(parameters
.getEnabledProtocols());
recordProtocol.setVersion(session.protocol.version);
@@ -105,6 +106,7 @@
if (parameters.getEnableSessionCreation()){
isResuming = false;
session = new SSLSessionImpl(parameters.getSecureRandom());
+ session.setPeer(engineOwner.getPeerHost(), engineOwner.getPeerPort());
session.protocol = ProtocolVersion.getLatestVersion(parameters
.getEnabledProtocols());
recordProtocol.setVersion(session.protocol.version);
@@ -625,4 +627,3 @@
}
}
-
diff --git a/libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java b/libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
index 3bb096b..782bb39 100644
--- a/libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
+++ b/libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
@@ -428,8 +428,8 @@
fatalAlert(AlertProtocol.HANDSHAKE_FAILURE,
"SSL Session may not be created");
}
- session = new SSLSessionImpl(cipher_suite, parameters
- .getSecureRandom());
+ session = new SSLSessionImpl(cipher_suite, parameters.getSecureRandom());
+ session.setPeer(engineOwner.getPeerHost(), engineOwner.getPeerPort());
}
recordProtocol.setVersion(clientHello.client_version);
