X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-persister-feature-adapter%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfigpusherfeature%2Finternal%2FAbstractFeatureWrapper.java;fp=opendaylight%2Fconfig%2Fconfig-persister-feature-adapter%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfigpusherfeature%2Finternal%2FAbstractFeatureWrapper.java;h=9e3806b13bc10d6fb91d9ed478594b211e40a10f;hb=b00413f0a9857892ac18db163e24de485ec9fbc4;hp=f95f2b89fd07a8e95c6b2051def6321ef6b4964d;hpb=64e760caf2a5d223cca7598b3ff8941ac37c7a96;p=controller.git diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java index f95f2b89fd..9e3806b13b 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java @@ -10,7 +10,6 @@ package org.opendaylight.controller.configpusherfeature.internal; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.io.Files; -import java.io.File; import java.util.LinkedHashSet; import java.util.List; import javax.xml.bind.JAXBException; @@ -33,7 +32,6 @@ import org.slf4j.LoggerFactory; public class AbstractFeatureWrapper implements Feature { private static final Logger LOG = LoggerFactory.getLogger(AbstractFeatureWrapper.class); - private static final String CONFIG_FILE_PATH_SUFFIX = "opendaylight" + File.separator + "karaf"; protected static final String CONFIG_FILE_SUFFIX = "xml"; protected Feature feature = null; @@ -69,9 +67,7 @@ public class AbstractFeatureWrapper implements Feature { } private static boolean isConfigXMLFile(String fullName) { - String path = new File(fullName).getPath(); - return path.contains(CONFIG_FILE_PATH_SUFFIX) && - Files.getFileExtension(fullName).equals(CONFIG_FILE_SUFFIX); + return Files.getFileExtension(fullName).equals(CONFIG_FILE_SUFFIX); } protected Optional getFeatureConfigSnapshotHolder(final ConfigFileInfo c) {