Revision 45736
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/spi/JDBCHelperBase.java | ||
---|---|---|
912 | 912 |
} |
913 | 913 |
} |
914 | 914 |
|
915 |
public String getConnectionProviderStatus() { |
|
916 |
return ""; |
|
917 |
} |
|
915 | 918 |
|
916 | 919 |
} |
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/spi/JDBCServerExplorerBase.java | ||
---|---|---|
183 | 183 |
|
184 | 184 |
public String getResourcesTablename(String tablename) { |
185 | 185 |
String resourceTablename = mapping.get(tablename); |
186 |
LOG.info("Resource of table "+tablename+" = "+resourceTablename); |
|
186 | 187 |
return resourceTablename; |
187 | 188 |
} |
188 | 189 |
|
... | ... | |
668 | 669 |
CachedValue<CustomResourcesConfig> cachedConfig = CACHED_CUSTOM_RESOURCES_CONFIG.get(key); |
669 | 670 |
if (cachedConfig != null) { |
670 | 671 |
CustomResourcesConfig config = cachedConfig.get(); |
672 |
LOG.info("Return custom resource from CACHE."); |
|
671 | 673 |
return config; |
672 | 674 |
} |
673 | 675 |
JDBCStoreParameters params = this.helper.createOpenStoreParameters(this.getParameters()); |
... | ... | |
818 | 820 |
JDBCStoreParameters params = this.helper.createOpenStoreParameters(this.getParameters()); |
819 | 821 |
setConfigValue(params, CONFIG_NAME_CUSTOM_RESOURCES, config.toJsonString()); |
820 | 822 |
refreshCustomResourcesConfig(); |
823 |
|
|
824 |
|
|
825 |
if (StringUtils.isNotBlank(resourcesTableName)) { |
|
826 |
try { |
|
827 |
params = this.getOpenParameters(); |
|
828 |
params.setTable(resourcesTableName); |
|
829 |
JDBCResourcesStorage resourcesStorage = new JDBCResourcesStorage( |
|
830 |
null, |
|
831 |
params, |
|
832 |
tableName, |
|
833 |
config.isResourcesReadOnly(resourcesTableName) |
|
834 |
); |
|
835 |
resourcesStorage.clearCache(); |
|
836 |
} catch (Exception ex) { |
|
837 |
LOG.debug("Can't remove local cache for table "+tableName, ex); |
|
838 |
} |
|
839 |
} |
|
840 |
|
|
841 |
|
|
821 | 842 |
} |
822 | 843 |
|
823 | 844 |
private static boolean setConfigValue(JDBCStoreParameters params, String name, String value) { |
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/spi/JDBCResourcesStorage.java | ||
---|---|---|
500 | 500 |
|
501 | 501 |
return resource.remove(); |
502 | 502 |
} |
503 |
|
|
504 |
void clearCache() throws IOException { |
|
505 |
byte[] data = this.resourcesStoreParameters.toByteArray(); |
|
506 |
|
|
507 |
FoldersManager fm = ToolsLocator.getFoldersManager(); |
|
508 |
File f = fm.getTemporaryFile("resources-storage", "jdbc", DigestUtils.md5Hex(data)); |
|
509 |
FileUtils.deleteDirectory(f); |
|
510 |
|
|
511 |
} |
|
512 |
|
|
503 | 513 |
} |
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/impl/ResulSetControlerBase.java | ||
---|---|---|
15 | 15 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper; |
16 | 16 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCUtils; |
17 | 17 |
import org.gvsig.fmap.dal.store.jdbc2.ResulSetControler; |
18 |
import org.gvsig.fmap.dal.store.jdbc2.spi.JDBCHelperBase; |
|
18 | 19 |
import org.gvsig.fmap.dal.store.jdbc2.spi.JDBCSQLBuilderBase; |
19 | 20 |
import org.gvsig.tools.dispose.Disposable; |
20 | 21 |
import org.gvsig.tools.dispose.DisposeUtils; |
... | ... | |
52 | 53 |
if( LOGGER.isDebugEnabled() ) { |
53 | 54 |
LOGGER.debug("["+JDBCUtils.getConnId(resulSet)+"] ResultSetEntryBase "+this.hexId+" "+sql); |
54 | 55 |
} |
56 |
LOGGER.debug(((JDBCHelperBase)helper).getConnectionProviderStatus()); |
|
55 | 57 |
} |
56 | 58 |
|
57 | 59 |
private void used() { |
... | ... | |
139 | 141 |
JDBCUtils.closeQuietly(st); |
140 | 142 |
helper.closeConnection(con); |
141 | 143 |
this.resultSet = null; |
142 |
LOGGER.trace(
|
|
144 |
LOGGER.debug(
|
|
143 | 145 |
"Close ResulSetEntryBase id {} (total {})", |
144 | 146 |
this.getID(), |
145 | 147 |
getOpenCount() |
146 | 148 |
); |
149 |
LOGGER.debug(((JDBCHelperBase)helper).getConnectionProviderStatus()); |
|
147 | 150 |
pack(); |
148 | 151 |
} |
149 | 152 |
|
Also available in: Unified diff