DIRAPI-339: Fix NullPointerException

apache · Apr 27, 2019 · 70588ac · 70588ac
1 parent 2f74af7
commit 70588ac
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.../client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java b/.../client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
@@ -686,7 +686,11 @@ public boolean connect() throws LdapException
 
                     if ( !isSecured )
                     {
-                        Throwable cause = ( Throwable ) connectionFuture.getSession().getAttribute( EXCEPTION_KEY );
+                        Throwable cause = connectionFuture.getException();
+                        if ( cause == null && connectionFuture.getSession() != null )
+                        {
+                            cause = ( Throwable ) connectionFuture.getSession().getAttribute( EXCEPTION_KEY );
+                        }
                         throw new LdapTlsHandshakeException( I18n.err( I18n.ERR_04120_TLS_HANDSHAKE_ERROR ), cause );
                     }
                 }