litesoft

Explore

Commits

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

		@@ -72,8 +72,9 @@
72	72
73	73		private static Builder FromParams( String pKnownAs, String pId )
74	74		{
75		-	if ( Utils.isAsciiIdentifier( pKnownAs = Utils.noEmpty( pKnownAs ) ) &&
76		-	Utils.isNoSpaceAscii( pId = Utils.noEmpty( pId ) ) )
	75	+	pKnownAs = Utils.noEmpty( pKnownAs );
	76	+	pId = Utils.noEmpty( pId );
	77	+	if ( Utils.isAsciiIdentifier( pKnownAs ) && Utils.isNoSpaceAscii( pId ) )
77	78		{
78	79		return new Builder( pKnownAs, pId );
79	80		}
		@@ -82,7 +83,8 @@
82	83
83	84		public static Builder Acknowledge( HelloMessage pHelloMessage, String pKnownAs )
84	85		{
85		-	if ( (pHelloMessage != null) && Utils.isAsciiIdentifier( pKnownAs = Utils.noEmpty( pKnownAs ) ) )
	86	+	pKnownAs = Utils.noEmpty( pKnownAs );
	87	+	if ( (pHelloMessage != null) && Utils.isAsciiIdentifier( pKnownAs ) )
86	88		{
87	89		return FromParams( pKnownAs, pHelloMessage.getId() );
88	90		}