- [Issue 4302] Unexpected errors using single JNDI connection with SSL and ...

abobrov

05.38.2009 a6cb619e21072969c9a900c64423e67b5fb6b0a2

- [Issue 4302] Unexpected errors using single JNDI connection with SSL and multiple threads : Make TLS and SASL byte channel implementations Channel and ByteChannel [ReadableByteChannel/WritableByteChannel] interface compliant by blocking related operations to only occur on a single thread at any given time.

 opendj-sdk/opends/src/server/org/opends/server/extensions/SASLByteChannel.java

@@ -199,7 +199,7 @@
    /**
     * {@inheritDoc}
     */
    public int read(ByteBuffer clearDst) throws IOException {
    public synchronized int read(ByteBuffer clearDst) throws IOException {
      int bytesToRead = lengthSize;
      if(reading)
        bytesToRead = neededBytes;
@@ -277,7 +277,7 @@
    /**
     * {@inheritDoc}
     */
    public int write(ByteBuffer clearSrc) throws IOException {
    public synchronized int write(ByteBuffer clearSrc) throws IOException {
        int sendBufSize = getAppBufSize();
        int srcLen = clearSrc.remaining();
        ByteBuffer sendBuffer = ByteBuffer.allocate(sendBufSize);
@@ -323,7 +323,7 @@
    /**
     * {@inheritDoc}
     */
    public void close() throws IOException {
    public synchronized void close() throws IOException {
        saslContext.dispose();
        saslContext=null;
    }

 opendj-sdk/opends/src/server/org/opends/server/extensions/TLSByteChannel.java

@@ -205,7 +205,7 @@
    /**
     * {@inheritDoc}
     */
    public int read(ByteBuffer clearBuffer) throws IOException {
    public synchronized int read(ByteBuffer clearBuffer) throws IOException {
        SSLEngineResult.HandshakeStatus hsStatus;
        if(!reading)
          appNetData.clear();
@@ -252,7 +252,7 @@
    /**
     * {@inheritDoc}
     */
    public void close() throws IOException {
    public synchronized void close() throws IOException {
        sslEngine.closeInbound();
        sslEngine.closeOutbound();
        SSLEngineResult.HandshakeStatus hsStatus =
@@ -328,7 +328,7 @@
    /**
     * {@inheritDoc}
     */
    public int write(ByteBuffer clearData) throws IOException {
    public synchronized int write(ByteBuffer clearData) throws IOException {
        if(!socketChannel.isOpen() || sslEngine.isOutboundDone()) {
            throw new ClosedChannelException();
        }