Skip to content

Commit 6a9669d

Browse files
committed
Merge branch 'develop' of https://github.com/oneteme/inspect-server into develop
2 parents b3d649c + 2bfc9a0 commit 6a9669d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/main/java/org/usf/inspect/server/service/RequestService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ public List<Session> getMainSessionsForSearch(JqueryMainSessionFilter jsf) throw
387387
.columns(
388388
getColumns(
389389
MAIN_SESSION, ID, NAME, START, END, LOCATION, TYPE,
390-
USER
390+
USER,ERR_TYPE, ERR_MSG
391391
))
392392
.columns(getColumns(INSTANCE, APP_NAME))
393393
.filters(MAIN_SESSION.column(INSTANCE_ENV).eq(INSTANCE.column(ID)));
@@ -406,6 +406,7 @@ public List<Session> getMainSessionsForSearch(JqueryMainSessionFilter jsf) throw
406406
main.setAppName(rs.getString(APP_NAME.reference()));
407407
main.setUser(rs.getString(USER.reference()));
408408
main.setType(rs.getString(TYPE.reference()));
409+
main.setException(getExceptionInfoIfNotNull(rs.getString(ERR_TYPE.reference()), rs.getString(ERR_MSG.reference())));
409410
main.setRestRequests(new ArrayList<>());
410411
main.setLocalRequests(new ArrayList<>());
411412
main.setDatabaseRequests(new ArrayList<>());

0 commit comments

Comments
 (0)