Revision 45338
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/impl/DatabaseWorkspaceStoresRepository.java | ||
|---|---|---|
| 5 | 5 |
import java.util.HashMap; |
| 6 | 6 |
import java.util.Map; |
| 7 | 7 |
import java.util.logging.Level; |
| 8 |
import org.apache.commons.lang3.StringUtils; |
|
| 8 | 9 |
import org.gvsig.expressionevaluator.ExpressionUtils; |
| 9 | 10 |
import org.gvsig.fmap.dal.AbstractStoresRepository; |
| 10 | 11 |
import org.gvsig.fmap.dal.DALLocator; |
| ... | ... | |
| 140 | 141 |
if( this.repository==null ) {
|
| 141 | 142 |
this.load(); |
| 142 | 143 |
} |
| 143 |
return this.repository.get(name); |
|
| 144 |
DataStoreParameters params = this.repository.get(name); |
|
| 145 |
if (params!=null) {
|
|
| 146 |
return params; |
|
| 147 |
} |
|
| 148 |
for (String key : this.repository.keySet()) {
|
|
| 149 |
if (StringUtils.equalsIgnoreCase(key, name)) {
|
|
| 150 |
return this.repository.get(key); |
|
| 151 |
} |
|
| 152 |
} |
|
| 153 |
return null; |
|
| 144 | 154 |
} |
| 145 | 155 |
|
| 146 | 156 |
@Override |
| 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 | ||
|---|---|---|
| 229 | 229 |
if( !f.exists() ) {
|
| 230 | 230 |
InputStream is = null; |
| 231 | 231 |
FileOutputStream os = null; |
| 232 |
File f2 = null; |
|
| 232 | 233 |
try {
|
| 233 | 234 |
is = this.getInputStream(); |
| 235 |
if (is==null) {
|
|
| 236 |
return null; |
|
| 237 |
} |
|
| 234 | 238 |
FileUtils.forceMkdir(f.getParentFile()); |
| 235 | 239 |
os = new FileOutputStream(f); |
| 236 | 240 |
IOUtils.copy(is, os); |
| 237 | 241 |
|
| 238 |
File f2 = fm.getTemporaryFile("resources-storage","jdbc", key.getLeft(), "parameters");
|
|
| 242 |
f2 = fm.getTemporaryFile("resources-storage","jdbc", key.getLeft(), "parameters");
|
|
| 239 | 243 |
byte[] data = this.storeParameters.toByteArray(); |
| 240 | 244 |
os = new FileOutputStream(f2); |
| 241 | 245 |
IOUtils.write(data, os); |
| 242 | 246 |
} catch (IOException ex) {
|
| 247 |
FileUtils.deleteQuietly(f); |
|
| 248 |
FileUtils.deleteQuietly(f2); |
|
| 243 | 249 |
return null; |
| 244 | 250 |
} finally {
|
| 245 | 251 |
IOUtils.closeQuietly(is); |
| ... | ... | |
| 289 | 295 |
} |
| 290 | 296 |
InputStream is = this.getInputStreamFromCache(); |
| 291 | 297 |
if( is==null ) {
|
| 292 |
is = this.getInputStream(); |
|
| 298 |
is = this.getInputStream(); |
|
| 299 |
if ( is==null) {
|
|
| 300 |
return null; |
|
| 301 |
} |
|
| 293 | 302 |
} |
| 294 | 303 |
this.in = is; |
| 295 | 304 |
return new ResourceInputStream(); |
Also available in: Unified diff