git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2523 basic sleep and retry (3 times) on 429 response code with
[jalview.git]
/
src
/
jalview
/
ext
/
ensembl
/
EnsemblXref.java
diff --git
a/src/jalview/ext/ensembl/EnsemblXref.java
b/src/jalview/ext/ensembl/EnsemblXref.java
index
c0b00b1
..
c002c08
100644
(file)
--- a/
src/jalview/ext/ensembl/EnsemblXref.java
+++ b/
src/jalview/ext/ensembl/EnsemblXref.java
@@
-124,8
+124,11
@@
class EnsemblXref extends EnsemblRestClient
if (url != null)
{
br = getHttpResponse(url, ids);
if (url != null)
{
br = getHttpResponse(url, ids);
+ if (br != null)
+ {
+ result = parseResponse(br);
+ }
}
}
- return (parseResponse(br));
} catch (IOException e)
{
// ignore
} catch (IOException e)
{
// ignore
@@
-168,16
+171,16
@@
class EnsemblXref extends EnsemblRestClient
while (rvals.hasNext())
{
JSONObject val = (JSONObject) rvals.next();
while (rvals.hasNext())
{
JSONObject val = (JSONObject) rvals.next();
- String dbName = val.get("dbname").toString();
- if (dbName.equals(GO_GENE_ONTOLOGY))
+ String dbname = val.get("dbname").toString();
+ if (GO_GENE_ONTOLOGY.equals(dbname))
{
continue;
}
String id = val.get("primary_id").toString();
{
continue;
}
String id = val.get("primary_id").toString();
- if (dbName != null && id != null)
+ if (dbname != null && id != null)
{
{
- dbName = DBRefUtils.getCanonicalName(dbName);
- DBRefEntry dbref = new DBRefEntry(dbName, getXRefVersion(), id);
+ dbname = DBRefUtils.getCanonicalName(dbname);
+ DBRefEntry dbref = new DBRefEntry(dbname, getXRefVersion(), id);
result.add(dbref);
}
}
result.add(dbref);
}
}