- Timestamp:
- 2009-05-25T13:42:15+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java
r19547 r19585 200 200 } else if(llssite_cfg_file.isIndependentGSI()) { 201 201 // there is a url, it's not pending, and it is llssite.cfg: meaning GSI has started up 202 running = true; 202 203 return; 203 204 } … … 397 398 } 398 399 catch (MalformedURLException exception) { 400 running = false; 399 401 exception.printStackTrace(); 400 DebugStream.printStackTrace(exception); 402 DebugStream.printStackTrace(exception); 401 403 } 402 404 return false; … … 415 417 String url = llssite_cfg_file.getURL(); 416 418 if(url != null) { 417 if( isURLPending()) {419 if(url.equals(LLSSiteConfig.URL_PENDING)) { 418 420 running = false; 419 421 return; … … 423 425 try { 424 426 Configuration.library_url = new URL(url); 427 running = true; 425 428 } 426 429 catch (MalformedURLException exception) { 430 running = false; 427 431 DebugStream.printStackTrace(exception); 428 432 exception.printStackTrace(); 429 433 } 430 } 434 } 431 435 else { // NO URL in current ConfigFile, check the other configfile for a URL 432 436 // to see if the server was restarted using that file. … … 435 439 436 440 if(llssite_cfg_file.usingLLS_configFile()) { // if a GSI is already using llssite_cfg, this would have loaded it in 437 if(isURLPending()) { 441 url = llssite_cfg_file.getURL(); //if(isURLPending()) { 442 if(url.equals(LLSSiteConfig.URL_PENDING)) { 438 443 running = false; 439 444 } else { … … 525 530 526 531 /** Tries to get a glisite.cfg file and then loads it, setting it as the configFile */ 527 public void useGLISiteCfg(File server_exe) { 532 public void useGLISiteCfg(File server_exe) 533 { 528 534 if(!glisite_cfg.exists()) { // create it from the templates or the llssite.cfg file 529 535 … … 577 583 578 584 lastModified = configFile.lastModified(); 579 //System.err.println("***** we're using llssite_configfile, url:" + getURL());580 585 return true; 581 586 }
Note:
See TracChangeset
for help on using the changeset viewer.