antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

fixed bug that would check for another server running on the default rmi port

Browse source 
even if helma was using only the embedded webserver.
This commit is contained in:
stefanp 2002-07-29 12:42:52 +00:00
parent 4b35b3bf2c
commit b4595a2a29
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/helma/main/Server.java
View file

@ -203,7 +203,12 @@ import org.mortbay.util.*;
dbSources = new Hashtable (); dbSources = new Hashtable ();
try { try {
checkRunning (); // check if a server is already running with this db // check if servers are already running on the given ports
if (websrvPort==0)
checkRunning (rmiPort);
else
checkRunning (websrvPort);
checkRunning (xmlrpcPort);
} catch (Exception running) { } catch (Exception running) {
System.out.println (running.getMessage ()); System.out.println (running.getMessage ());
System.exit (1); System.exit (1);
@ -383,14 +388,14 @@ import org.mortbay.util.*;
/** /**
* A primitive method to check whether a server is already running on our port. * A primitive method to check whether a server is already running on our port.
*/ */
private void checkRunning () throws Exception { private void checkRunning (int portNumber) throws Exception {
try { try {
java.net.Socket socket = new java.net.Socket ("localhost", rmiPort); java.net.Socket socket = new java.net.Socket ("localhost", portNumber);
} catch (Exception x) { } catch (Exception x) {
return; return;
} }
// if we got so far, another server is already running on this port and db // if we got so far, another server is already running on this port and db
throw new Exception ("Error: Server already running on this port"); throw new Exception ("Error: Server already running on this port: " + portNumber);
} }
public String getProperty( String key ) { public String getProperty( String key ) {