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
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into trialMerge
[jalview.git]
/
src
/
jalview
/
ext
/
ensembl
/
EnsemblMap.java
diff --git
a/src/jalview/ext/ensembl/EnsemblMap.java
b/src/jalview/ext/ensembl/EnsemblMap.java
index
56657e0
..
f01bd4f
100644
(file)
--- a/
src/jalview/ext/ensembl/EnsemblMap.java
+++ b/
src/jalview/ext/ensembl/EnsemblMap.java
@@
-98,18
+98,6
@@
public class EnsemblMap extends EnsemblRestClient
}
@Override
}
@Override
- protected String getRequestMimeType(boolean multipleIds)
- {
- return "application/json";
- }
-
- @Override
- protected String getResponseMimeType()
- {
- return "application/json";
- }
-
- @Override
protected URL getUrl(List<String> ids) throws MalformedURLException
{
return null; // not used
protected URL getUrl(List<String> ids) throws MalformedURLException
{
return null; // not used
@@
-257,7
+245,10
@@
public class EnsemblMap extends EnsemblRestClient
{
url = getIdMapUrl(domain, accession, start, end, cdsOrCdna);
br = getHttpResponse(url, null);
{
url = getIdMapUrl(domain, accession, start, end, cdsOrCdna);
br = getHttpResponse(url, null);
- return (parseIdMappingResponse(br, accession, domain));
+ if (br != null)
+ {
+ return (parseIdMappingResponse(br, accession, domain));
+ }
}
return null;
} catch (Throwable t)
}
return null;
} catch (Throwable t)