harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r993394 - /harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/
Date Tue, 07 Sep 2010 15:29:40 GMT
Author: odeakin
Date: Tue Sep  7 15:29:39 2010
New Revision: 993394

URL: http://svn.apache.org/viewvc?rev=993394&view=rev
Log:
Remove some more classes that are no longer used.

Removed:
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateSSLv3.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DHParameters.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/EndOfBufferException.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/EndOfSourceException.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Handshake.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLStreamedInput.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java
Modified:
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java?rev=993394&r1=993393&r2=993394&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
Tue Sep  7 15:29:39 2010
@@ -141,7 +141,7 @@ public class HandshakeIODataStream
     public int read() throws IOException {
         if (read_pos == read_pos_end) {
             //return -1;
-            throw new EndOfBufferException();
+            //throw new EndOfBufferException();
         }
         return buffer[read_pos++] & 0xFF;
     }
@@ -154,7 +154,7 @@ public class HandshakeIODataStream
     @Override
     public byte[] read(int length) throws IOException {
         if (length > available()) {
-            throw new EndOfBufferException();
+            //throw new EndOfBufferException();
         }
         byte[] res = new byte[length];
         System.arraycopy(buffer, read_pos, res, 0, length);
@@ -165,7 +165,7 @@ public class HandshakeIODataStream
     @Override
     public int read(byte[] dest, int offset, int length) throws IOException {
         if (length > available()) {
-            throw new EndOfBufferException();
+            //throw new EndOfBufferException();
         }
         System.arraycopy(buffer, read_pos, dest, offset, length);
         read_pos = read_pos + length;

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java?rev=993394&r1=993393&r2=993394&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
Tue Sep  7 15:29:39 2010
@@ -95,15 +95,7 @@ public abstract class HandshakeProtocol 
      * Pending session
      */ 
     protected SSLSessionImpl session;
-
-    /**
-     * Sended and received handshake messages
-     */ 
-    protected ServerKeyExchange serverKeyExchange;
-    protected ClientKeyExchange clientKeyExchange;
-    protected Finished clientFinished;
-    protected Finished serverFinished;
-    
+   
     /**
      * Indicates that change cipher spec message has been received
      */
@@ -476,10 +468,6 @@ public abstract class HandshakeProtocol 
      */
     protected void clearMessages() {
         io_stream.clearBuffer();
-        serverKeyExchange = null;
-        clientKeyExchange = null;
-        clientFinished = null;
-        serverFinished = null;
     }
     
     /**

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java?rev=993394&r1=993393&r2=993394&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
Tue Sep  7 15:29:39 2010
@@ -259,9 +259,9 @@ public class SSLRecordProtocol {
             }
             this.session = session;
             // create new connection state
-            pendingConnectionState = ((version == null) || (version[1] == 1))
+            /*pendingConnectionState = ((version == null) || (version[1] == 1))
                 ? (ConnectionState) new ConnectionStateTLS(getSession())
-                : (ConnectionState) new ConnectionStateSSLv3(getSession());
+                : (ConnectionState) new ConnectionStateSSLv3(getSession());*/
             sessionWasChanged = true;
         } else {
             // wait for rehandshaking's session



Mime
View raw message