Revision 47779 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/H2SpatialStoreParameters.java

View differences:

H2SpatialStoreParameters.java
22 22
package org.gvsig.fmap.dal.store.h2;
23 23

  
24 24
import java.io.File;
25
import java.io.IOException;
25 26
import java.util.Properties;
27
import org.apache.commons.io.FilenameUtils;
28
import org.gvsig.fmap.dal.DataStoreParameters;
26 29
import org.gvsig.fmap.dal.exception.ValidateDataParametersException;
27 30
import org.gvsig.fmap.dal.store.jdbc.JDBCConnectionParameters;
28 31
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParametersBase;
......
95 98
    }
96 99

  
97 100
    @Override
101
    public boolean isTheSameStore(DataStoreParameters params) {
102
        if(!(params instanceof H2SpatialStoreParameters)){
103
            return false;
104
        }
105
        File f1 = H2SpatialUtils.normalizeH2File(this.getFile());
106
        File f2 = H2SpatialUtils.normalizeH2File(((H2SpatialStoreParameters)params).getFile());
107
        try {
108
            if(!FilenameUtils.equalsOnSystem(f1.getCanonicalPath(), f2.getCanonicalPath())){
109
                return false;
110
            }
111
        } catch (IOException ex) {
112
            if(!FilenameUtils.equalsOnSystem(f1.getAbsolutePath(), f2.getAbsolutePath())){
113
                return false;
114
            }
115
        }
116
        return super.isTheSameStore(params);
117
        
118
    }
119
    
120
    
121
    @Override
98 122
    public boolean getMaintainGlobalConnection() {
99 123
        return this.helper.getMaintainGlobalConnection();
100 124
    }

Also available in: Unified diff