System Touch

Author: mearvk

source/connections/ConnectionPoller.java

@@ -31,10 +31,8 @@ public class ConnectionPoller extends Thread
 
     protected static final Integer READ_WRITE_STANDARD_SOCKET_TIMEOUT = 60*2*1000;
 
-    public ConnectionPoller(WebExpress web_express, BaseServer base_server, String host, Integer port)
+    public ConnectionPoller(BaseServer base_server, String host, Integer port)
     {
-        this.web_express = web_express;
-
         this.base_server = base_server;
 
         this.host = host;

source/server/base/BaseServer.java

@@ -2,6 +2,7 @@
 
 import commons.CommonRails;
 import connections.*;
+import server.nitro.WebExpress;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -27,6 +28,7 @@ public abstract class BaseServer extends Thread
 
     public Boolean RUNNING = true;
 
+
     public CurrentConnections current_connections = new CurrentConnections();
 
     private final RecordedConnections recorded_connections = new RecordedConnections();
@@ -46,6 +48,8 @@ public BaseServer(String host, Integer PORT)
 
         this.PORT = PORT;
 
+        this.INHERITOR = this;
+
         this.setName("BasicServer");
 
         try
@@ -186,7 +190,7 @@ public void run()
 
                 try
                 {
-                    connection.thread = new ConnectionPoller(null,this, this.HOST, this.PORT);
+                    connection.thread = new ConnectionPoller(this, this.HOST, this.PORT);
 
                     connection.thread.start();
                 }

source/server/nitro/WebExpress.java

@@ -10,6 +10,7 @@
 public class WebExpress extends BaseServer
 {
     protected String hash = "0xDA717018470E213F";
+
     public static final String[] TELNET_PROXY_SERVER_ARGS = new String[]{"telnet", "tacobell.phd", "80"};
 
     public static final Boolean TELNET_PROXY = Boolean.FALSE;
@@ -32,6 +33,8 @@ public class WebExpress extends BaseServer
 
     public MessageQueue MESSAGE_QUEUE = new MessageQueue(this);
 
+    public BaseServer BASESERVER;
+
     public WebExpress()
     {
         this.setName("United States D500 WebExpress");