[Acmcontester-developers] SF.net SVN: acmcontester:[404] ACMServer/trunk/ACMServer

[<br...@us...>]

Revision: 404
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=404&view=rev
Author:   brus07
Date:     2008-10-04 23:18:38 +0000 (Sat, 04 Oct 2008)

Log Message:
-----------
Refactoring in using SystemMessageType.

Modified Paths:
--------------
    ACMServer/trunk/ACMServer/Library/Connector/SocketServer.cs
    ACMServer/trunk/ACMServer/Tester/Library/SocketClientGate.cs

Modified: ACMServer/trunk/ACMServer/Library/Connector/SocketServer.cs
===================================================================
--- ACMServer/trunk/ACMServer/Library/Connector/SocketServer.cs	2008-10-03 14:16:07 UTC (rev 403)
+++ ACMServer/trunk/ACMServer/Library/Connector/SocketServer.cs	2008-10-04 23:18:38 UTC (rev 404)
@@ -67,8 +67,11 @@
         private void DataArrived(object Data, SocketStream DataSender)
         {
             SystemMessage sysMes = SystemMessage.Deserialize((byte[])Data);
-            if (SystemMessageX(sysMes) == true)
-                return;
+            if (sysMes.IsType("SystemTestBusyMessage") == true)
+            {
+                if (SystemMessageX(sysMes) == true)
+                    return;
+            }
             DataArriver(sysMes);
         }
         protected virtual void DataArriver(SystemMessage message)
@@ -121,7 +124,7 @@
                     string message = "test";
                     message += " " + server.ClientsList[i].GetHashCode().ToString();
                     message += " " + curHashCode;
-                    SystemMessage mes = new SystemMessage(message);
+                    SystemMessage mes = new SystemMessage(message, "SystemTestBusyMessage");
                     ServerSend(mes, i);
                 }
             }

Modified: ACMServer/trunk/ACMServer/Tester/Library/SocketClientGate.cs
===================================================================
--- ACMServer/trunk/ACMServer/Tester/Library/SocketClientGate.cs	2008-10-03 14:16:07 UTC (rev 403)
+++ ACMServer/trunk/ACMServer/Tester/Library/SocketClientGate.cs	2008-10-04 23:18:38 UTC (rev 404)
@@ -21,12 +21,19 @@
 
         void SocketClientGate_onDataArrived(SystemMessage message)
         {
-            if (SystemMessageX(message) == true)
-                return;
+            if (message.IsType("SystemTestBusyMessage") == true)
+            {
+                if (SystemMessageX(message) == true)
+                    return;
+            }
             OnAddLogText("Receive", message.Message);
             //OnDataArrived(message);
             descriptionMessage = message.Description;
-            AddWork(message.Message);
+
+            if (message.IsType("TestingSubmit") == true)
+            {
+                AddWork(message.Message);
+            }
         }
 
         public new void Disconnect()
@@ -69,7 +76,7 @@
                     result += " " + mes[i];
                 }
                 OnAddLogText("SystemSend", result);
-                base.Send(new SystemMessage(result));
+                base.Send(new SystemMessage(result, _message.Type, _message.Description));
                 return true;
             }
             return false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.