xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2627 harden static initialization on edex main thread" into development

Browse source 
Former-commit-id: 6b08aaf55c [formerly 7c02ab6b66 [formerly 82f20a96a82ef7f047f716662d319e522ee1c394]]
Former-commit-id: 7c02ab6b66
Former-commit-id: fdba3b3099
This commit is contained in:
Richard Peter 2014-03-04 17:54:09 -06:00 • committed by Gerrit Code Review
commit 2be140c0c4
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/ProcessUtil.java
View file

@ -51,6 +51,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory;
* Feb 05, 2013 1580 mpduff EventBus refactor.
* Feb 12, 2013 1615 bgonzale Changed ProcessEvent pluginName to dataType.
* Jan 21, 2014 2627 njensen Added logFailedData() and logFailureAsInfo()
* Mar 04, 2014 2627 njensen Harden static initialization
*
* </pre>
*
@ -79,19 +80,30 @@ public class ProcessUtil {
protected static final boolean RETAIN_FAILED_DATA;
static {
// this will probably only ever be true on a testbed
RETAIN_FAILED_DATA = Boolean.getBoolean("retain.failed.data");
if (RETAIN_FAILED_DATA) {
FAILED_DIR = PropertiesFactory.getInstance().getEnvProperties()
.getEnvValue("DEFAULTDATADIR")
+ File.separator + "failed";
File file = new File(FAILED_DIR);
if (!file.exists()) {
file.mkdir();
boolean retain = false;
String dir = null;
try {
/*
* this will probably only ever be true on a testbed because sites
* typically keep multiple days of raw data
*/
retain = Boolean.getBoolean("retain.failed.data");
if (retain) {
dir = PropertiesFactory.getInstance().getEnvProperties()
.getEnvValue("DEFAULTDATADIR")
+ File.separator + "failed";
File file = new File(dir);
if (!file.exists()) {
file.mkdirs();
}
}
} else {
FAILED_DIR = null;
} catch (Throwable t) {
dir = null;
retain = false;
handler.error("Error validating retain.failed.data settings", t);
}
FAILED_DIR = dir;
RETAIN_FAILED_DATA = retain;
}
/**
@ -235,7 +247,7 @@ public class ProcessUtil {
String fullpath = getHeaderProperty(headers, ("ingestFileName"));
handler.error("Failed to ingest " + fullpath, e);
if (RETAIN_FAILED_DATA) {
if (RETAIN_FAILED_DATA && FAILED_DIR != null) {
File badfile = new File(fullpath);
if (badfile.exists()) {
String filename = badfile.getName();