directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r918692 - in /directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport: AbstractTransport.java TcpTransport.java UdpTransport.java
Date Wed, 03 Mar 2010 21:11:03 GMT
Author: kayyagari
Date: Wed Mar  3 21:11:02 2010
New Revision: 918692

URL: http://svn.apache.org/viewvc?rev=918692&view=rev
Log:
o fix for DIRSERVER-1474
o changed the getAcceptor() method to abstract in AbstractTransport
o overwritten getAcceptor() in the TCP and UDP transports to recreate the IoAcceptor if it
was disposed
o removed the unused methods getTcpTravsport() and getUdpTransport() from the TCP and UDP
transport classes respectively  

Modified:
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/AbstractTransport.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/TcpTransport.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/UdpTransport.java

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/AbstractTransport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/AbstractTransport.java?rev=918692&r1=918691&r2=918692&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/AbstractTransport.java
(original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/AbstractTransport.java
Wed Mar  3 21:11:02 2010
@@ -184,10 +184,7 @@
     /**
      * {@inheritDoc}
      */
-    public IoAcceptor getAcceptor()
-    {
-        return acceptor;
-    }
+    public abstract IoAcceptor getAcceptor();
     
     
     /**

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/TcpTransport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/TcpTransport.java?rev=918692&r1=918691&r2=918692&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/TcpTransport.java
(original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/TcpTransport.java
Wed Mar  3 21:11:02 2010
@@ -162,8 +162,13 @@
     /**
      * @return The associated SocketAcceptor
      */
-    public SocketAcceptor getSocketAcceptor()
+    public SocketAcceptor getAcceptor()
     {
+        if( ( acceptor != null ) && acceptor.isDisposed() )
+        {
+            acceptor = createAcceptor( getAddress(), getPort(), getNbThreads(), getBackLog()
);
+        }
+
         return acceptor == null ? null : (SocketAcceptor)acceptor;
     }
     

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/UdpTransport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/UdpTransport.java?rev=918692&r1=918691&r2=918692&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/UdpTransport.java
(original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/UdpTransport.java
Wed Mar  3 21:11:02 2010
@@ -88,8 +88,13 @@
     /**
      * @return The associated DatagramAcceptor
      */
-    public DatagramAcceptor getDatagramAcceptor()
+    public DatagramAcceptor getAcceptor()
     {
+        if( ( acceptor != null ) && acceptor.isDisposed() )
+        {
+            acceptor = createAcceptor( getAddress(), getPort() );
+        }
+        
         return acceptor == null ? null : (DatagramAcceptor)acceptor;
     }
     



Mime
View raw message