litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
j2blake 2014-01-15 16:43:59 -05:00
commit fb63559aa6
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java
View file

@ -51,7 +51,7 @@ public abstract class JsonObjectProducer extends JsonProducer {
try { try {
jsonObject = process(); jsonObject = process();
} catch (Exception e) { } catch (Exception e) {
log.error("Failed to create JSON response" + e); log.error("Failed to create JSON response", e);
errorMessage = e.toString(); errorMessage = e.toString();
resp.setStatus(500 /* HttpURLConnection.HTTP_SERVER_ERROR */); resp.setStatus(500 /* HttpURLConnection.HTTP_SERVER_ERROR */);
} }

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/json/JsonProducer.java
View file

@ -80,7 +80,7 @@ public abstract class JsonProducer {
VClass vclass = vreq.getWebappDaoFactory().getVClassDao() VClass vclass = vreq.getWebappDaoFactory().getVClassDao()
.getVClassByURI(uri); .getVClassByURI(uri);
if (vclass == null) { if (vclass == null) {
log.error("Couldn't retrieve vclass "); log.error("Couldn't retrieve vclass '" + uri + "'");
throw new IllegalStateException("Class " + uri + " not found"); throw new IllegalStateException("Class " + uri + " not found");
} }
return vclass; return vclass;