Project

General

Profile

Revision 7809

do not create solr-home if there is no template to compy into that directory (need to be able to create it later if/when someone decides to use and deploy metacat-index). https://projects.ecoinformatics.org/ecoinfo/issues/6006

View differences:

src/edu/ucsb/nceas/metacat/admin/PropertiesAdmin.java
263 263
				boolean solrHomeExists = new File(solrHomePath).exists();
264 264
				if (!solrHomeExists) {
265 265
					try {
266
						FileUtil.createDirectory(solrHomePath);
267 266
						String metacatWebInf = ServiceService.getRealConfigDir();
268 267
						String metacatIndexSolrHome = metacatWebInf + "/../../" + indexContext + "/WEB-INF/classes/solr-home";
269 268
						// only attempt to copy if we have the source directory to copy from
270 269
						File sourceDir = new File(metacatIndexSolrHome);
271 270
						if (sourceDir.exists()) {
271
							FileUtil.createDirectory(solrHomePath);
272 272
							OrFileFilter fileFilter = new OrFileFilter();
273 273
							fileFilter.addFileFilter(DirectoryFileFilter.DIRECTORY);
274 274
							fileFilter.addFileFilter(new WildcardFileFilter("*"));

Also available in: Unified diff