commit f7c60eddd552e7a8683515bccfa1c5baacd840c8
author Neil GM Richards <neil_richards@uk.ibm.com> Tue Jun 21 02:48:23 2016 +0100
committer Neil GM Richards <neil_richards@uk.ibm.com> Tue Jun 21 02:57:17 2016 +0100
tree 5275306562618db657c4c756769fa6fa766dcc19
parent 6c4cc03cd56214aa7e97ff61941dacac3a90bc9d

Add extra check for connector helper setting in Connector_impl

yoko-core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Connector_impl.java

diff --git a/yoko-core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Connector_impl.java b/yoko-core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Connector_impl.java
index e2a737e..b257a22 100644
--- a/yoko-core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Connector_impl.java
+++ b/yoko-core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Connector_impl.java
@@ -459,6 +459,7 @@
     // ------------------------------------------------------------------
 
     private Connector_impl(IOR ior, Policy[] policies, String host, int port, boolean keepAlive, ConnectCB[] cb, ListenerMap lm, ConnectionHelper helper, ExtendedConnectionHelper xhelper, Codec codec) {
+        if ((null == helper) && (null == xhelper)) throw new IllegalArgumentException("Both connection helpers must not be null");
         ior_ = ior;
         policies_ = policies;
         keepAlive_ = keepAlive;
@@ -474,8 +475,8 @@
         this(ior, policies, host, port, keepAlive, cb, lm, helper, null, codec);
     }
 
-    public Connector_impl(IOR ior, Policy[] policies, String host, int port, boolean keepAlive, ConnectCB[] cb, ListenerMap lm, ExtendedConnectionHelper helper, Codec codec) {
-        this(ior, policies, host, port, keepAlive, cb, lm, null, helper, codec);
+    public Connector_impl(IOR ior, Policy[] policies, String host, int port, boolean keepAlive, ConnectCB[] cb, ListenerMap lm, ExtendedConnectionHelper xhelper, Codec codec) {
+        this(ior, policies, host, port, keepAlive, cb, lm, null, xhelper, codec);
     }
 
     public void finalize() throws Throwable {