mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-14 17:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Additional linting of keywordsearch.Server

Browse Source
This commit is contained in:
Richard Cordovano 2015-10-23 10:24:22 -04:00
parent 7d0569c7d0
commit a76821e123
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
View File

@ -167,6 +167,7 @@ public class Server {
static final int DEFAULT_SOLR_STOP_PORT = 34343; static final int DEFAULT_SOLR_STOP_PORT = 34343;
private int currentSolrServerPort = 0; private int currentSolrServerPort = 0;
private int currentSolrStopPort = 0; private int currentSolrStopPort = 0;
private volatile Core currentCore = null;
private static final boolean DEBUG = false;//(Version.getBuildType() == Version.Type.DEVELOPMENT); private static final boolean DEBUG = false;//(Version.getBuildType() == Version.Type.DEVELOPMENT);
private final UNCPathUtilities uncPathUtilities = new UNCPathUtilities(); private final UNCPathUtilities uncPathUtilities = new UNCPathUtilities();
@ -182,7 +183,7 @@ public class Server {
// This could be a local or remote server. // This could be a local or remote server.
private HttpSolrServer currentSolrServer; private HttpSolrServer currentSolrServer;
private final String instanceDir; // private final String instanceDir;
private final File solrFolder; private final File solrFolder;
private final ServerAction serverAction; private final ServerAction serverAction;
private InputStreamPrinterThread errorRedirectThread; private InputStreamPrinterThread errorRedirectThread;
@ -197,7 +198,7 @@ public class Server {
this.localSolrServer = new HttpSolrServer("http://localhost:" + currentSolrServerPort + "/solr"); //NON-NLS this.localSolrServer = new HttpSolrServer("http://localhost:" + currentSolrServerPort + "/solr"); //NON-NLS
serverAction = new ServerAction(); serverAction = new ServerAction();
solrFolder = InstalledFileLocator.getDefault().locate("solr", Server.class.getPackage().getName(), false); //NON-NLS solrFolder = InstalledFileLocator.getDefault().locate("solr", Server.class.getPackage().getName(), false); //NON-NLS
instanceDir = solrFolder.getAbsolutePath() + File.separator + "solr"; //NON-NLS // instanceDir = solrFolder.getAbsolutePath() + File.separator + "solr"; //NON-NLS
javaPath = PlatformUtil.getJavaPath(); javaPath = PlatformUtil.getJavaPath();
logger.log(Level.INFO, "Created Server instance"); //NON-NLS logger.log(Level.INFO, "Created Server instance"); //NON-NLS
@ -586,10 +587,10 @@ public class Server {
return true; return true;
} }
/**
/*
* ** Convenience methods for use while we only open one case at a time *** * ** Convenience methods for use while we only open one case at a time ***
*/ */
private volatile Core currentCore = null;
synchronized void openCore() throws KeywordSearchModuleException { synchronized void openCore() throws KeywordSearchModuleException {
if (currentCore != null) { if (currentCore != null) {