Revision 45775 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/feature/impl/DefaultForeingKey.java

View differences:

DefaultForeingKey.java
161 161

  
162 162
    public void setDescriptor(FeatureAttributeDescriptor descriptor) {
163 163
        this.descriptor = descriptor;
164
        FeatureStore store = descriptor.getStore();
165
        if (store == null) {
164
    }
165
    
166
    private StoresRepository getStoresRepository() {
167
        if( this.descriptor == null ) {
166 168
            this.storesRepository = DALLocator.getDataManager().getStoresRepository();
167

  
168 169
        } else {
169
            this.storesRepository = store.getStoresRepository();
170
            FeatureStore store = descriptor.getStore();
171
            if( store==null ) {
172
                this.storesRepository = DALLocator.getDataManager().getStoresRepository();
173
            } else {
174
                this.storesRepository = store.getStoresRepository();
175
            }
170 176
        }
177
        return this.storesRepository;
171 178
    }
172 179
    
180
    @Override
173 181
    public void unbind() {
182
        this.getStoresRepository(); // Force get stores repository
174 183
        this.descriptor = null;
175 184
        this.availableValues = null;
176 185
    }
......
266 275

  
267 276
    @Override
268 277
    public ContextForeingKey createContext() {
269
        return new DefaultContextForeingKey(this.storesRepository);
278
        return new DefaultContextForeingKey(this.getStoresRepository());
270 279
    }
271 280

  
272 281
    @Override

Also available in: Unified diff