Revision 47716 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.h2spatial/org.gvsig.h2spatial.h2gis132/org.gvsig.h2spatial.h2gis132.provider/src/main/java/org/gvsig/fmap/dal/store/h2/H2SpatialHelper.java
| H2SpatialHelper.java | ||
|---|---|---|
| 70 | 70 |
protected static final Logger LOGGER = LoggerFactory.getLogger(H2SpatialHelper.class); |
| 71 | 71 |
|
| 72 | 72 |
public static final String H2SPATIAL_JDBC_DRIVER = "org.h2.Driver"; |
| 73 |
|
|
| 74 |
public static class ConnectionProviderImpl extends AbstractConnectionProvider implements ConnectionProvider {
|
|
| 75 | 73 |
|
| 74 |
public static class H2SpatialConnectionProvider extends AbstractConnectionProvider implements ConnectionProvider {
|
|
| 75 |
|
|
| 76 | 76 |
private static boolean needRegisterDriver = true; |
| 77 | 77 |
|
| 78 | 78 |
private BasicDataSource dataSource = null; |
| 79 | 79 |
|
| 80 | 80 |
private H2SpatialConnectionParameters connectionParameters; |
| 81 | 81 |
|
| 82 |
public ConnectionProviderImpl(H2SpatialConnectionParameters connectionParameters) {
|
|
| 82 |
public H2SpatialConnectionProvider(H2SpatialConnectionParameters connectionParameters) {
|
|
| 83 | 83 |
this.connectionParameters = connectionParameters; |
| 84 | 84 |
} |
| 85 | 85 |
|
| 86 |
public H2SpatialConnectionParameters getConnectionParameters() {
|
|
| 87 |
return this.connectionParameters; |
|
| 88 |
} |
|
| 89 |
|
|
| 86 | 90 |
@Override |
| 87 | 91 |
public String getStatus() {
|
| 88 | 92 |
if(dataSource == null) {
|
| ... | ... | |
| 329 | 333 |
LOGGER.debug("Can't get connection-provider",th);
|
| 330 | 334 |
} |
| 331 | 335 |
if( this.connectionProvider!=null ) {
|
| 332 |
((ConnectionProviderImpl) this.connectionProvider).shutdown();
|
|
| 336 |
((H2SpatialConnectionProvider) this.connectionProvider).shutdown();
|
|
| 333 | 337 |
this.connectionProvider = null; |
| 334 | 338 |
} |
| 335 | 339 |
H2SpatialUtils.server_stop(); |
| ... | ... | |
| 368 | 372 |
if( connectionParameters==null ) {
|
| 369 | 373 |
return null; // Testing mode? |
| 370 | 374 |
} |
| 371 |
this.connectionProvider = new ConnectionProviderImpl(connectionParameters);
|
|
| 375 |
this.connectionProvider = new H2SpatialConnectionProvider(connectionParameters);
|
|
| 372 | 376 |
} |
| 373 | 377 |
return this.connectionProvider; |
| 374 | 378 |
} |
| ... | ... | |
| 388 | 392 |
if( connectionParameters==null ) {
|
| 389 | 393 |
return null; // Testing mode? |
| 390 | 394 |
} |
| 391 |
this.connectionProvider = new ConnectionProviderImpl(connectionParameters); |
|
| 395 |
this.connectionProvider = new H2SpatialConnectionProvider(connectionParameters); |
|
| 396 |
H2SpatialUtils.addGlobalConnection((H2SpatialConnectionProvider) this.connectionProvider); |
|
| 392 | 397 |
} |
| 393 | 398 |
JDBCConnection connection = new JDBCConnectionBase( |
| 394 | 399 |
this.getTransaction(), |
| ... | ... | |
| 567 | 572 |
} |
| 568 | 573 |
return p; |
| 569 | 574 |
} |
| 570 |
|
|
| 571 |
|
|
| 572 | 575 |
} |
Also available in: Unified diff