directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r675002 - /directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
Date Tue, 08 Jul 2008 22:18:32 GMT
Author: elecharny
Date: Tue Jul  8 15:18:30 2008
New Revision: 675002

URL: http://svn.apache.org/viewvc?rev=675002&view=rev
Log:
Fix for DIRSERVER-1180

Modified:
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=675002&r1=675001&r2=675002&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
Tue Jul  8 15:18:30 2008
@@ -1152,12 +1152,17 @@
             if ( cause.getCause() instanceof ResponseCarryingMessageException )
             {
                 ResponseCarryingMessageException rcme = ( ResponseCarryingMessageException
) cause.getCause();
-                session.write( rcme.getResponse() );
-                return;
+                                
+                if ( rcme.getResponse() != null )
+                {
+                    session.write( rcme.getResponse() );
+                    return;
+                }                
             }
             
             SessionLog.warn( session,
                 "Unexpected exception forcing session to close: sending disconnect notice
to client.", cause );
+            
             session.write( NoticeOfDisconnect.PROTOCOLERROR );
             registry.remove( session );
             session.close();



Mime
View raw message