Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
JAliEn
JAliEn
Commits
8b39e752
Commit
8b39e752
authored
Apr 22, 2021
by
Costin Grigoras
Browse files
Potential NPE and other fixes suggested by Eclipse
parent
a1481aaf
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/utils/crawler/SEFileCrawler.java
View file @
8b39e752
...
...
@@ -11,19 +11,7 @@ import static utils.crawler.CrawlingStatusCode.E_PFN_XRDSTAT_FAILED;
import
static
utils
.
crawler
.
CrawlingStatusCode
.
E_UNEXPECTED_ERROR
;
import
static
utils
.
crawler
.
CrawlingStatusCode
.
S_FILE_CHECKSUM_MATCH
;
import
static
utils
.
crawler
.
CrawlingStatusCode
.
S_FILE_CHECKSUM_MISMATCH
;
import
alien.catalogue.GUID
;
import
alien.catalogue.GUIDUtils
;
import
alien.catalogue.PFN
;
import
alien.config.ConfigUtils
;
import
alien.io.IOUtils
;
import
alien.io.protocols.Factory
;
import
alien.io.protocols.SourceException
;
import
alien.io.protocols.SourceExceptionCode
;
import
alien.io.protocols.Xrootd
;
import
alien.se.SE
;
import
alien.se.SEUtils
;
import
alien.shell.commands.JAliEnCOMMander
;
import
alien.user.JAKeyStore
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileNotFoundException
;
...
...
@@ -36,8 +24,23 @@ import java.util.Iterator;
import
java.util.List
;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
import
org.json.simple.JSONArray
;
import
org.json.simple.JSONObject
;
import
alien.catalogue.GUID
;
import
alien.catalogue.GUIDUtils
;
import
alien.catalogue.PFN
;
import
alien.config.ConfigUtils
;
import
alien.io.IOUtils
;
import
alien.io.protocols.Factory
;
import
alien.io.protocols.SourceException
;
import
alien.io.protocols.SourceExceptionCode
;
import
alien.io.protocols.Xrootd
;
import
alien.se.SE
;
import
alien.se.SEUtils
;
import
alien.shell.commands.JAliEnCOMMander
;
import
alien.user.JAKeyStore
;
import
utils.StatusType
;
/**
...
...
@@ -430,11 +433,13 @@ public class SEFileCrawler {
if
(
Long
.
valueOf
(
0
).
equals
(
catalogueFileSize
))
status
=
new
CrawlingStatus
(
E_FILE_EMPTY
,
"Catalogue file size is 0"
);
else
if
(
catalogueMD5
==
null
)
{
GUIDUtils
.
updateMd5
(
guid
.
guid
,
observedMD5
);
if
(
guid
!=
null
)
GUIDUtils
.
updateMd5
(
guid
.
guid
,
observedMD5
);
status
=
new
CrawlingStatus
(
E_CATALOGUE_MD5_IS_NULL
,
"Catalogue MD5 is null"
);
}
else
if
(
catalogueMD5
.
isBlank
())
{
GUIDUtils
.
updateMd5
(
guid
.
guid
,
observedMD5
);
if
(
guid
!=
null
)
GUIDUtils
.
updateMd5
(
guid
.
guid
,
observedMD5
);
status
=
new
CrawlingStatus
(
E_CATALOGUE_MD5_IS_BLANK
,
"Catalogue MD5 is blank"
);
}
else
if
(!
catalogueMD5
.
equalsIgnoreCase
(
observedMD5
))
...
...
@@ -488,9 +493,9 @@ public class SEFileCrawler {
* @return String
*/
private
static
String
formatError
(
final
String
error
)
{
if
(
outputFileType
.
equals
(
OUTPUT_FORMAT_CSV
))
{
if
(
OUTPUT_FORMAT_CSV
.
equals
(
outputFileType
))
{
final
String
errorNew
=
error
.
replaceAll
(
"\\R"
,
" "
);
return
errorNew
.
replace
All
(
","
,
" "
);
return
errorNew
.
replace
(
","
,
" "
);
}
return
error
;
...
...
@@ -538,7 +543,7 @@ public class SEFileCrawler {
logger
.
info
(
"Getting job output from data list of size "
+
dataList
.
size
());
logger
.
info
(
"Values "
+
dataList
);
if
(
fileType
.
toLowerCase
().
equals
(
OUTPUT_FORMAT_JSON
))
if
(
OUTPUT_FORMAT_JSON
.
equals
(
fileType
.
toLowerCase
()
))
jobOutput
=
getOutputAsJSON
(
dataList
);
else
jobOutput
=
getOutputAsCSV
(
dataList
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment