1 files changed, 8 insertions, 1 deletions
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
index 1da965a3a..c3e84f136 100644
--- a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
+++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
@@ -413,7 +413,14 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory {
         if (conn == null) {
             return;
         }
-        BoundConnection boundconn = (BoundConnection) conn;
+        BoundConnection boundconn = null;
+
+        if (conn instanceof BoundConnection) {
+            boundconn = (BoundConnection) conn;
+        } else {
+            log(ILogger.LL_WARN, "returnConn : Connection is not an BoundConnection");
+            return;
+        }
 
         if (boundconn.getFacId() != mConns) {
             log(ILogger.LL_WARN, "returnConn: unknown connection.");