diff --git a/gms/src/main/java/it/inaf/ia2/gms/persistence/LoggingDAO.java b/gms/src/main/java/it/inaf/ia2/gms/persistence/LoggingDAO.java index b04b810e79d9ff06dd633ee3244e76afaf07ecb5..cf7cf8d53fb68ad3d662d3cd51f1331528a53676 100644 --- a/gms/src/main/java/it/inaf/ia2/gms/persistence/LoggingDAO.java +++ b/gms/src/main/java/it/inaf/ia2/gms/persistence/LoggingDAO.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import javax.sql.DataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; @@ -51,7 +52,7 @@ public class LoggingDAO { private String getStackTraceString(Exception ex) { StringWriter sw = new StringWriter(); - try (PrintWriter pw = new PrintWriter(sw)) { + try ( PrintWriter pw = new PrintWriter(sw)) { ex.printStackTrace(pw); } return sw.toString(); @@ -91,9 +92,11 @@ public class LoggingDAO { if (request.getUserPrincipal() != null && request.getUserPrincipal() instanceof RapPrincipal) { return request.getUserPrincipal().getName(); } else if (request.getSession(false) != null) { - return sessionData.getUserId(); - } else { - return null; + try { + return sessionData.getUserId(); + } catch (BeanCreationException ex) { + } } + return null; } }