ESDK-3423 Fixed the connection recovery for EDP connections when the host and port are specified.

Author: soranat

Java/Eta/ValueAdd/src/main/java/com/thomsonreuters/upa/valueadd/reactor/ReactorChannel.java

@@ -1368,18 +1368,21 @@ Channel reconnectEDP(Error error)
 		// if done getting the auth token and service discovery
     	if (_state == State.EDP_RT_DONE)
     	{
-    		if (_watchlist != null)
+    		if(Reactor.requestServiceDiscovery(reactorConnectInfo))
     		{
-    			if (verifyAndCopyServiceDiscoveryData(_loginRequestForEDP, errorInfo) != ReactorReturnCodes.SUCCESS)
-    			{
-    				error.text(errorInfo.error().text());
-        			return null;
-    			}
-    		}
-    		else if (_watchlist == null && verifyAndCopyServiceDiscoveryData(_loginRequestForEDP, errorInfo) != ReactorReturnCodes.SUCCESS)
-    		{
-    			error.text(errorInfo.error().text());
-    			return null;	
+	    		if (_watchlist != null)
+	    		{
+	    			if (verifyAndCopyServiceDiscoveryData(_loginRequestForEDP, errorInfo) != ReactorReturnCodes.SUCCESS)
+	    			{
+	    				error.text(errorInfo.error().text());
+	        			return null;
+	    			}
+	    		}
+	    		else if (_watchlist == null && verifyAndCopyServiceDiscoveryData(_loginRequestForEDP, errorInfo) != ReactorReturnCodes.SUCCESS)
+	    		{
+	    			error.text(errorInfo.error().text());
+	    			return null;	
+	    		}
     		}
 
 			return reconnect(reactorConnectInfo, error);