Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed potential class pool override in integration tests.
[controller.git]
/
opendaylight
/
config
/
config-persister-directory-autodetect-adapter
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
persist
/
storage
/
directory
/
autodetect
/
FileType.java
diff --git
a/opendaylight/config/config-persister-directory-autodetect-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/directory/autodetect/FileType.java
b/opendaylight/config/config-persister-directory-autodetect-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/directory/autodetect/FileType.java
index 03654ebcb223209c01b26738ccadfe4accec97a9..779a887924ca832ac9a0dcbfca23c536d723aa85 100644
(file)
--- a/
opendaylight/config/config-persister-directory-autodetect-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/directory/autodetect/FileType.java
+++ b/
opendaylight/config/config-persister-directory-autodetect-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/directory/autodetect/FileType.java
@@
-23,6
+23,7
@@
enum FileType {
plaintext, xml;
public static final String XML_STORAGE_FIRST_LINE = "<" + ConfigSnapshot.SNAPSHOT_ROOT_ELEMENT_NAME + ">";
plaintext, xml;
public static final String XML_STORAGE_FIRST_LINE = "<" + ConfigSnapshot.SNAPSHOT_ROOT_ELEMENT_NAME + ">";
+ private static final String XML_FILE_DEFINITION_LINE = "<?xml";
static FileType getFileType(File file) {
String firstLine = readFirstLine(file);
static FileType getFileType(File file) {
String firstLine = readFirstLine(file);
@@
-35,7
+36,10
@@
enum FileType {
}
private static boolean isXmlStorage(String firstLine) {
}
private static boolean isXmlStorage(String firstLine) {
- return firstLine.startsWith(XML_STORAGE_FIRST_LINE);
+ boolean isXml = false;
+ isXml |= firstLine.startsWith(XML_STORAGE_FIRST_LINE);
+ isXml |= firstLine.startsWith(XML_FILE_DEFINITION_LINE);
+ return isXml;
}
private static boolean isPlaintextStorage(String firstLine) {
}
private static boolean isPlaintextStorage(String firstLine) {