ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/conient/uk/org/iscream/cms/conient/ConnectionHandler.java

Comparing projects/cms/source/conient/uk/org/iscream/cms/conient/ConnectionHandler.java (file contents):
Revision 1.18 by ajm, Mon Feb 26 00:25:00 2001 UTC vs.
Revision 1.19 by ajm, Tue Feb 27 03:09:58 2001 UTC

#	Line 144 | Line 144 | public class ConnectionHandler extends Thread {
144		* types.
145		*/
146		public void run() {
147	<	if(_configuration.getProperty("control.onstartconnect") != null) {
147	>	if(!_configuration.getProperty("control.onstartconnect").equals("0")) {
148		_actionQueue.add(new Integer(CONNECT));
149		}
150	<	if(_configuration.getProperty("data.onstartconnect") != null) {
150	>	if(!_configuration.getProperty("data.onstartconnect").equals("0")) {
151		_actionQueue.add(new Integer(STARTDATA));
152		}
153		while(_running) {
#	Line 521 | Line 521 | public class ConnectionHandler extends Thread {
521		*/
522		private String handleFirewall(String server, int port, Process firewallProcess) {
523		String firewallCommand = _configuration.getProperty("firewall.command");
524	+	String useFirewall = _configuration.getProperty("useFirewall");
525		String firewallCommandWait = _configuration.getProperty("firewall.commandwait");
526		String firewallServer = _configuration.getProperty("firewall.server");
527		// if we are running firewall support...then lets start it
528	<	if (firewallCommand != null) {
528	>	if (!useFirewall.equals("0")) {
529		// clean up the command with what we want
530		firewallCommand = replaceText(firewallCommand, "%PORT%", new Integer(port).toString());
531		firewallCommand = replaceText(firewallCommand, "%SERVER%", server);
#	Line 552 | Line 553 | public class ConnectionHandler extends Thread {
553
554		// set the server we want to return
555		server = firewallServer;
556	<	if (server == null) {
556	>	if (server.equals("")) {
557		server = DEFAULT_FIREWALL_SERVER;
558		}
559		} catch (IOException e) {

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines