ESDK-2570: Setting a blank userName on an EMA OmmConsumer or OmmNIProvider configuration will now result in an InvalidUsageException. The Performance tools have been updated to reflect this change.

MitchellKato · MitchellKato · commit 4b9d61733eef · 2018-11-07T13:27:09.000-06:00
diff --git a/Java/Ema/Core/src/main/java/com/thomsonreuters/ema/access/EmaConfigImpl.java b/Java/Ema/Core/src/main/java/com/thomsonreuters/ema/access/EmaConfigImpl.java
@@ -44,6 +44,7 @@ abstract class  EmaConfigBaseImpl
 	protected ProgrammaticConfigure				_programmaticConfigure;
 	
 	private OmmInvalidConfigurationExceptionImpl _oommICExcept;
+	private OmmInvalidUsageExceptionImpl		_ommIUExcept;
 	
 	protected StringBuilder 						_configStrBuilder;
 	protected String							 _configSessionName = null;
@@ -71,6 +72,15 @@ protected OmmInvalidConfigurationExceptionImpl oommICExcept()
 		return _oommICExcept;
 	}
 	
+	protected OmmInvalidUsageExceptionImpl ommIUExcept()
+	{
+		if (_ommIUExcept == null)
+			_ommIUExcept = new OmmInvalidUsageExceptionImpl();
+		
+		return _ommIUExcept;
+	}
+	
+	
 	protected StringBuilder configStrBuilder()
 	{
 		if (_configStrBuilder == null)
@@ -183,6 +193,12 @@ protected void clearInt()
 	
 	protected void usernameInt(String username)
 	{
+		if(username == null || username.length() == 0)
+		{
+			configStrBuilder().append("EmaConfigImpl:UserName input String cannot be blank.");
+			throw ( ommIUExcept().message( _configStrBuilder.toString()));
+		}
+			
 		_rsslLoginReq.userName().data(username);
 	}
 	
diff --git a/Java/Ema/PerfTools/src/main/java/com/thomsonreuters/ema/perftools/emajconsperf/ConsumerThread.java b/Java/Ema/PerfTools/src/main/java/com/thomsonreuters/ema/perftools/emajconsperf/ConsumerThread.java
@@ -9,6 +9,7 @@
 import com.thomsonreuters.ema.access.GenericMsg;
 import com.thomsonreuters.ema.access.OmmConsumer;
 import com.thomsonreuters.ema.access.OmmConsumerClient;
+import com.thomsonreuters.ema.access.OmmConsumerConfig;
 import com.thomsonreuters.ema.access.OmmConsumerEvent;
 import com.thomsonreuters.ema.access.OmmState;
 import com.thomsonreuters.ema.access.ReqMsg;
@@ -57,6 +58,7 @@ public class ConsumerThread implements Runnable, OmmConsumerClient
     protected LatencyRandomArray _genMsgLatencyRandomArray; /* generic msg random latency array */
     private int _JVMPrimingRefreshCount; /* used to determine when JVM priming is complete */
     private OmmConsumer _consumer;
+    private OmmConsumerConfig _ommConfig;
     private long _itemHandle;
 
     {
@@ -165,10 +167,24 @@ protected void initialize()
 	
 	protected void initializeOmmConsumer()
 	{
-		if (_consPerfConfig.useUserDispatch()) 
-			_consumer = EmaFactory.createOmmConsumer(EmaFactory.createOmmConsumerConfig().username(_consPerfConfig.username()).operationModel(OperationModel.USER_DISPATCH));
-		else
-			_consumer = EmaFactory.createOmmConsumer(EmaFactory.createOmmConsumerConfig().username(_consPerfConfig.username()).operationModel(OperationModel.API_DISPATCH));
+		try
+		{
+			_ommConfig = EmaFactory.createOmmConsumerConfig();
+			// A blank user name is an invalid input to OmmConsumerConfig.username and will trigger an invalid usage exception.
+			if(_consPerfConfig.username().length() != 0)
+				_ommConfig.username(_consPerfConfig.username());
+			
+			if(_consPerfConfig.useUserDispatch())
+				_ommConfig.operationModel(OperationModel.USER_DISPATCH);
+			else
+				_ommConfig.operationModel(OperationModel.API_DISPATCH);
+				
+			_consumer = EmaFactory.createOmmConsumer(_ommConfig);
+		}
+		catch(Exception e)
+		{
+			System.out.println("Exception found"+e);
+		}
 		
 		_srcDirHandler.serviceName(_consPerfConfig.serviceName());
 		long directoryHandle = _consumer.registerClient(_srcDirHandler.getRequest(), _srcDirHandler);
