harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r996959 - in /harmony/enhanced/java/branches/omd/classlib/modules/x-net/src: main/java/org/apache/harmony/xnet/provider/jsse/ test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ test/impl/java/org/apache/harmony/xnet/tests/provid...
Date Tue, 14 Sep 2010 15:49:31 GMT
Author: odeakin
Date: Tue Sep 14 15:49:31 2010
New Revision: 996959

URL: http://svn.apache.org/viewvc?rev=996959&view=rev
Log:
Remove classes and associated tests no longer needed for this implementation.

Removed:
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertException.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertProtocol.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Appendable.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionState.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ContentType.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DataStream.java
    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/Message.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ProtocolVersion.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineDataStream.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLv3Constants.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/HandshakeProtocolTest.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/ProtocolVersionTest.java
Modified:
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.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/DelegatedTask.java?rev=996959&r1=996958&r2=996959&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
Tue Sep 14 15:49:31 2010
@@ -17,8 +17,6 @@
 
 package org.apache.harmony.xnet.provider.jsse;
 
-import org.apache.harmony.xnet.provider.jsse.HandshakeProtocol;
-
 import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
@@ -29,9 +27,9 @@ import java.security.PrivilegedException
  */
 public class DelegatedTask implements Runnable {
 
-    private final HandshakeProtocol handshaker;
+    /*private final HandshakeProtocol handshaker;
     private final PrivilegedExceptionAction<Void> action;
-    private final AccessControlContext  context;
+    private final AccessControlContext  context;*/
     
     /**
      * Creates DelegatedTask
@@ -39,17 +37,17 @@ public class DelegatedTask implements Ru
      * @param handshaker
      * @param context
      */
-    public DelegatedTask(PrivilegedExceptionAction<Void> action, HandshakeProtocol
handshaker, AccessControlContext  context) {
+    /*public DelegatedTask(PrivilegedExceptionAction<Void> action, HandshakeProtocol
handshaker, AccessControlContext  context) {
         this.action = action;
         this.handshaker = handshaker;
         this.context = context;
-    }
+    }*/
 
     /**
      * Executes DelegatedTask
      */
     public void run() {
-        synchronized (handshaker) {
+        /*synchronized (handshaker) {
             try {
                 AccessController.doPrivileged(action, context);
             } catch (PrivilegedActionException e) {
@@ -59,7 +57,6 @@ public class DelegatedTask implements Ru
                 // pass exception to HandshakeProtocol
                 handshaker.delegatedTaskErr = e;
             }
-        }
-
+        }*/
     }
 }

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.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/SSLInputStream.java?rev=996959&r1=996958&r2=996959&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java
Tue Sep 14 15:49:31 2010
@@ -41,9 +41,6 @@ public abstract class SSLInputStream ext
      * exception, not return -1. The type of exception depends
      * on implementation. It was done for simplifying and speeding
      * up of processing of such cases.
-     * @see org.apache.harmony.xnet.provider.jsse.SSLStreamedInput#read()
-     * @see org.apache.harmony.xnet.provider.jsse.SSLBufferedInput#read()
-     * @see org.apache.harmony.xnet.provider.jsse.HandshakeIODataStream#read()
      */
     @Override
     public abstract int read() throws IOException;

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.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/SSLSocketImpl.java?rev=996959&r1=996958&r2=996959&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
Tue Sep 14 15:49:31 2010
@@ -677,8 +677,7 @@ public class SSLSocketImpl extends SSLSo
             startHandshake();
         }
         if (logger != null) {
-            logger.println("SSLSocket.writeAppData: " +
-                    len + " " + SSLRecordProtocol.MAX_DATA_LENGTH);
+            logger.println("SSLSocket.writeAppData: " + len);
             //logger.println(new String(data, offset, len));
         }
 

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java?rev=996959&r1=996958&r2=996959&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java
Tue Sep 14 15:49:31 2010
@@ -77,12 +77,12 @@ public class SSLSessionImplTest extends 
 
     public void testGetApplicationBufferSize() {
         assertEquals(SSLSessionImpl.NULL_SESSION.getApplicationBufferSize(),
-                SSLRecordProtocol.MAX_DATA_LENGTH);
+                SSLSessionImpl.MAX_DATA_LENGTH);
     }
     
     public void testGetPacketBufferSize() {
         assertEquals(SSLSessionImpl.NULL_SESSION.getPacketBufferSize(),
-                SSLRecordProtocol.MAX_SSL_PACKET_SIZE);
+                SSLSessionImpl.MAX_SSL_PACKET_SIZE);
     }    
 
     public void testInvalidate() {



Mime
View raw message