Revision 4440
Added by daigle over 15 years ago
OrganizationAdmin.java | ||
---|---|---|
28 | 28 |
|
29 | 29 |
import java.io.IOException; |
30 | 30 |
import java.util.Set; |
31 |
import java.util.SortedMap; |
|
32 | 31 |
import java.util.Vector; |
33 | 32 |
|
34 | 33 |
import javax.servlet.ServletException; |
... | ... | |
43 | 42 |
import edu.ucsb.nceas.metacat.util.UtilException; |
44 | 43 |
import edu.ucsb.nceas.utilities.FileUtil; |
45 | 44 |
import edu.ucsb.nceas.utilities.GeneralPropertyException; |
46 |
import edu.ucsb.nceas.utilities.MetaDataProperty; |
|
47 | 45 |
import edu.ucsb.nceas.utilities.PropertiesMetaData; |
48 | 46 |
import edu.ucsb.nceas.utilities.PropertyNotFoundException; |
49 | 47 |
import edu.ucsb.nceas.utilities.SortedProperties; |
... | ... | |
173 | 171 |
// Try to create data file and backup directories if |
174 | 172 |
// necessary. |
175 | 173 |
String backupDir = PropertyService.getBackupDir(); |
176 |
if (!FileUtil.createDirectory(backupDir)) { |
|
177 |
String errorString = "Could not create directory: " + backupDir; |
|
174 |
try { |
|
175 |
FileUtil.createDirectory(backupDir); |
|
176 |
} catch (IOException ioe) { |
|
177 |
String errorString = "Could not create directory: " + backupDir |
|
178 |
+ " : " + ioe.getMessage(); |
|
178 | 179 |
logMetacat.error(errorString); |
179 | 180 |
validationErrors.add(errorString); |
180 | 181 |
} |
... | ... | |
191 | 192 |
+ "processing organization properties page: " + gpe.getMessage(); |
192 | 193 |
logMetacat.error(errorMessage); |
193 | 194 |
processingErrors.add(errorMessage); |
194 |
} catch (IOException ioe) { |
|
195 |
String errorMessage = "IO problem while processing organization " |
|
196 |
+ "properties page: " + ioe.getMessage(); |
|
197 |
logMetacat.error(errorMessage); |
|
198 |
processingErrors.add(errorMessage); |
|
199 | 195 |
} catch (UtilException ue) { |
200 | 196 |
String errorMessage = "Error in utilities while: " |
201 | 197 |
+ "processing organization properties page: " + ue.getMessage(); |
Also available in: Unified diff
change the FileUtil.createDirectory calls to catch an exception on error.