src/main/java/de/uapcore/lightpit/DatabaseFacade.java

changeset 50
2a90d105edec
parent 38
cf85ef18f231
     1.1 --- a/src/main/java/de/uapcore/lightpit/DatabaseFacade.java	Sat May 16 09:28:57 2020 +0200
     1.2 +++ b/src/main/java/de/uapcore/lightpit/DatabaseFacade.java	Sat May 16 11:37:57 2020 +0200
     1.3 @@ -139,9 +139,6 @@
     1.4  
     1.5          dataSource = null;
     1.6  
     1.7 -        final String contextName = Optional
     1.8 -                .ofNullable(sc.getInitParameter(Constants.CTX_ATTR_JNDI_CONTEXT))
     1.9 -                .orElse("java:comp/env");
    1.10          final String dbSchema = Optional
    1.11                  .ofNullable(sc.getInitParameter(Constants.CTX_ATTR_DB_SCHEMA))
    1.12                  .orElse(DB_DEFAULT_SCHEMA);
    1.13 @@ -155,9 +152,9 @@
    1.14          }
    1.15  
    1.16          try {
    1.17 -            LOG.debug("Trying to access JNDI context {}...", contextName);
    1.18 +            LOG.debug("Trying to access JNDI context ...");
    1.19              Context initialCtx = new InitialContext();
    1.20 -            Context ctx = (Context) initialCtx.lookup(contextName);
    1.21 +            Context ctx = (Context) initialCtx.lookup("java:comp/env");
    1.22  
    1.23              dataSource = retrieveDataSource(ctx);
    1.24  

mercurial