Revision 45713 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/DefaultFeatureStore.java

View differences:

DefaultFeatureStore.java
33 33 
import java.util.List;
34 34 
import java.util.Map;
35 35 
import java.util.Map.Entry;
36 
import java.util.Objects;
36 37 
import java.util.Set;
37 38 
import javax.json.JsonObject;
38 39 
import org.apache.commons.io.FilenameUtils;
......
1982 1983
1983 1984 
    private void loadDALFile() {
1984 1985 
        org.gvsig.tools.resourcesstorage.ResourcesStorage.Resource resource = null;
1986 
        ResourcesStorage resourcesStorage = null;
1985 1987 
        try {
1986 
            ResourcesStorage resourcesStorage = this.getResourcesStorage();
1988 
            resourcesStorage = this.getResourcesStorage();
1987 1989 
            if( resourcesStorage == null ) {
1988 1990 
                return;
1989 1991 
            }
......
1996 1998 
                dalFile.updateStore(this);
1997 1999 
            }
1998 2000 
        } catch (Throwable ex) {
1999 
            LOGGER.warn("Can't load DAL resource", ex);
2001 
            if( resource==null) {
2002 
                if( resourcesStorage==null ) {
2003 
                    LOGGER.warn("Can't load DAL resource (resname=null, resurl=null, storage=null)", ex);
2004 
                } else {
2005 
                    LOGGER.warn("Can't load DAL resource (resname=null, resurl=null, storage="+resourcesStorage.getClass().getName()+").", ex);
2006 
                }
2007 
            } else {
2008 
                LOGGER.warn("Can't load DAL resource (resname="+resource.getName()+", resurl="+Objects.toString(resource.getURL())+", storage="+resourcesStorage.getClass().getName()+").", ex);
2009 
            }
2000 2010 
        } finally {
2001 2011 
            IOUtils.closeQuietly(resource);
2002 2012 
        }

Also available in: Unified diff