Issue #2940 More filenames printed, null from bad rec.
Former-commit-id:e40c9a7be8
[formerlycd4921b35f
] [formerlya2ef100bfc
] [formerlye40c9a7be8
[formerlycd4921b35f
] [formerlya2ef100bfc
] [formerlydadc604ab3
[formerlya2ef100bfc
[formerly 26bfd426965d208f92bcb1fcd650b5f2299724a4]]]] Former-commit-id:dadc604ab3
Former-commit-id:af478efa5d
[formerlye58fa39adc
] [formerly 30f08e0872c7bff47d05e441f1dd1375d4fa9d03 [formerlyf54cbb83a1
]] Former-commit-id: 703f3933ff157bb876bac2fb5586159e18bb37bb [formerly07c49a82b5
] Former-commit-id:24a1a5a0c6
This commit is contained in:
parent
88f134aef8
commit
d740131519
1 changed files with 31 additions and 24 deletions
|
@ -218,7 +218,7 @@ public class FFMPProcessor {
|
||||||
}
|
}
|
||||||
|
|
||||||
statusHandler.handle(Priority.INFO,
|
statusHandler.handle(Priority.INFO,
|
||||||
"Processed Source: " + ffmpRec.getSourceName() + " sitekey: "
|
"Processed Source: " + source.getSourceName() + " sitekey: "
|
||||||
+ siteKey + " dataKey: " + dataKey + " time: "
|
+ siteKey + " dataKey: " + dataKey + " time: "
|
||||||
+ (System.currentTimeMillis() - time));
|
+ (System.currentTimeMillis() - time));
|
||||||
|
|
||||||
|
@ -1826,18 +1826,25 @@ public class FFMPProcessor {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the XMRG data array
|
* Gets the XMRG data array, checks HRAP/XMRG config for sanity.
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private short[][] getXMRGData() throws Exception {
|
private short[][] getXMRGData() throws Exception {
|
||||||
|
|
||||||
|
String fileName = "MISSING";
|
||||||
|
|
||||||
|
if (xmrg.getFile() != null) {
|
||||||
|
fileName = xmrg.getFile().getAbsolutePath();
|
||||||
|
}
|
||||||
|
|
||||||
this.extent = getExtents(source.getHrapGridFactor());
|
this.extent = getExtents(source.getHrapGridFactor());
|
||||||
setHRAPSubGrid(extent, source.getHrapGridFactor());
|
setHRAPSubGrid(extent, source.getHrapGridFactor());
|
||||||
|
|
||||||
if (xmrg.getHrapExtent() != null) {
|
if (xmrg.getHrapExtent() != null) {
|
||||||
xmrgData = xmrg.getData(extent);
|
xmrgData = xmrg.getData(extent);
|
||||||
} else {
|
} else {
|
||||||
throw new MalformedDataException("The XMRG data is malformed or the file is non-readable.");
|
throw new MalformedDataException("The XMRG data is malformed or the file is non-readable. "+fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
return xmrgData;
|
return xmrgData;
|
||||||
|
|
Loading…
Add table
Reference in a new issue