litesoft

Explore

Commits

Diff Revisions 609 vs 610 for /trunk/Java/InterModuleComm/InterModuleComm/src/InterModuleComm/ToMessage.java

		@@ -7,8 +7,7 @@
7	7
8	8		public final class ToMessage implements Message
9	9		{
10		-	protected static final String PREFIX =
11		-	Constants.PROTOCOL_PREFIX + ModuleMsgLifecycleForm.To + Constants.NV_SEP;
	10	+	protected static final String PREFIX = Constants.PROTOCOL_PREFIX + ModuleMsgLifecycleForm.To + Constants.NV_SEP;
12	11		protected static final String FROM_PREFIX = "From" + Constants.NV_SEP;
13	12		protected static final String ERROR_PREFIX = "Error" + Constants.NV_SEP;
14	13		protected static final String TERMINATOR_PREFIX = "Terminator" + Constants.NV_SEP;
		@@ -257,9 +256,11 @@
257	256		private static Builder fromParams( ToMsgForm pForm, String pFrom, String pTo, String pId,
258	257		String pError )
259	258		{
260		-	if ( Utils.isAsciiIdentifier( pFrom = Utils.noEmpty( pFrom ) ) &&
261		-	Utils.isAsciiIdentifier( pTo = Utils.noEmpty( pTo ) ) &&
262		-	Utils.isNoSpaceAscii( pId = Utils.noEmpty( pId ) ) )
	259	+	pFrom = Utils.noEmpty( pFrom );
	260	+	pTo = Utils.noEmpty( pTo );
	261	+	pId = Utils.noEmpty( pId );
	262	+
	263	+	if ( Utils.isAsciiIdentifier( pFrom ) && Utils.isAsciiIdentifier( pTo ) && Utils.isNoSpaceAscii( pId ) )
263	264		{
264	265		return new Builder( pForm, pFrom, pTo, pId, Utils.noEmpty( pError ) );
265	266		}