Merge "Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table" into omaha_13.3.1
Former-commit-id:a1ea0d020c
[formerly57d7559797
] [formerly456fd056f4
] [formerly93e99b64a6
[formerly456fd056f4
[formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]] Former-commit-id:93e99b64a6
Former-commit-id: db8baa1a7f8057094afd75e9aeaf6f46c5dd6820 [formerly3a1dc41b50
] Former-commit-id:ba4673b99a
This commit is contained in:
commit
a0298d4199
1 changed files with 59 additions and 36 deletions
|
@ -213,27 +213,39 @@ public class FFMPDataGenerator {
|
|||
.getCwa()))
|
||||
|| (domain.isPrimary() && fmdb
|
||||
.isPrimaryCwa())) {
|
||||
|
||||
setFFMPRow(fbd.get(key), tData,
|
||||
false, cwa);
|
||||
|
||||
if (virtualBasin != null) {
|
||||
for (Long id : ft
|
||||
.getVirtualGageBasinLookupIds(
|
||||
siteKey,
|
||||
key,
|
||||
huc,
|
||||
resource.basinTableDlg
|
||||
.getRowName())) {
|
||||
setFFMPRow(
|
||||
virtualBasin
|
||||
.get(id),
|
||||
tData, true, domain
|
||||
.getCwa());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
try {
|
||||
setFFMPRow(fbd.get(key), tData,
|
||||
false, cwa);
|
||||
} catch (Exception e) {
|
||||
statusHandler.handle(
|
||||
Priority.PROBLEM,
|
||||
"Couldn't create table row"
|
||||
+ e);
|
||||
}
|
||||
if (virtualBasin != null) {
|
||||
for (Long id : ft
|
||||
.getVirtualGageBasinLookupIds(
|
||||
siteKey,
|
||||
key,
|
||||
huc,
|
||||
resource.basinTableDlg
|
||||
.getRowName())) {
|
||||
try {
|
||||
setFFMPRow(
|
||||
virtualBasin
|
||||
.get(id),
|
||||
tData, true,
|
||||
domain.getCwa());
|
||||
} catch (Exception e) {
|
||||
statusHandler
|
||||
.handle(Priority.PROBLEM,
|
||||
"Couldn't create table row"
|
||||
+ e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
/*
|
||||
|
@ -262,7 +274,10 @@ public class FFMPDataGenerator {
|
|||
setFFMPRow(fbd.get(key), tData,
|
||||
isVGB, null);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
statusHandler.handle(
|
||||
Priority.PROBLEM,
|
||||
"Couldn't create table row"
|
||||
+ e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -290,20 +305,28 @@ public class FFMPDataGenerator {
|
|||
// virtual basin
|
||||
if (virtualBasin != null) {
|
||||
for (Long id : ft
|
||||
.getVirtualGageBasinLookupIds(
|
||||
siteKey,
|
||||
key,
|
||||
huc,
|
||||
resource.basinTableDlg
|
||||
.getRowName())) {
|
||||
setFFMPRow(
|
||||
virtualBasin
|
||||
.get(id),
|
||||
tData, true, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.getVirtualGageBasinLookupIds(
|
||||
siteKey,
|
||||
key,
|
||||
huc,
|
||||
resource.basinTableDlg
|
||||
.getRowName())) {
|
||||
try {
|
||||
setFFMPRow(
|
||||
virtualBasin
|
||||
.get(id),
|
||||
tData, true,
|
||||
null);
|
||||
} catch (Exception e) {
|
||||
statusHandler
|
||||
.handle(Priority.PROBLEM,
|
||||
"Couldn't create table row"
|
||||
+ e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue