Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java @ 5379:61bf64b102bc mapgenfix
Merge with default branch
| author | Christian Lins <christian.lins@intevation.de> |
|---|---|
| date | Fri, 22 Mar 2013 11:25:54 +0100 |
| parents | fb9dcc68b9c2 |
| children | fd7285e3829b |
comparison
equal
deleted
inserted
replaced
| 5175:cfc5540a4eec | 5379:61bf64b102bc |
|---|---|
| 135 props.setProperty(Environment.USER, credentials.getUser()); | 135 props.setProperty(Environment.USER, credentials.getUser()); |
| 136 props.setProperty(Environment.PASS, credentials.getPassword()); | 136 props.setProperty(Environment.PASS, credentials.getPassword()); |
| 137 props.setProperty(Environment.DRIVER, credentials.getDriver()); | 137 props.setProperty(Environment.DRIVER, credentials.getDriver()); |
| 138 props.setProperty(Environment.URL, credentials.getUrl()); | 138 props.setProperty(Environment.URL, credentials.getUrl()); |
| 139 | 139 |
| 140 String connectionInitSqls = credentials.getConnectionInitSqls(); | |
| 141 if (connectionInitSqls != null) { | |
| 142 props.setProperty("connectionInitSqls", connectionInitSqls); | |
| 143 } | |
| 144 | |
| 140 cfg.mergeProperties(props); | 145 cfg.mergeProperties(props); |
| 141 | 146 |
| 142 return cfg; | 147 return cfg; |
| 143 } | 148 } |
| 144 | 149 |