SANTUARIO-526 - XMLSecStartDocumentImpl returns null version instead of default "1.0". Thanks to Peter De Maeyer for the patch. This closes #20.
git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-java/trunk@1874882 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/.gitignore b/.gitignore
index 31d36ca..323a4bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,12 @@
+# Eclipse
/.classpath
/.project
+
+# IntelliJ
+/.idea/
+/*.iml
+
+# Maven
/target/
.pmd
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java
index 2cf2551..343c94d 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java
@@ -32,13 +32,13 @@
private final String systemId;
private final String characterEncodingScheme;
private final Boolean isStandAlone;
- private String version = "1.0";
+ private final String version;
public XMLSecStartDocumentImpl(String systemId, String characterEncodingScheme, Boolean standAlone, String version) {
this.systemId = systemId;
this.characterEncodingScheme = characterEncodingScheme;
isStandAlone = standAlone;
- this.version = version;
+ this.version = version != null ? version : "1.0";
}
@Override
diff --git a/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java b/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java
index 83b4213..5e8cce3 100644
--- a/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java
@@ -308,7 +308,7 @@
case XMLStreamConstants.START_DOCUMENT:
assertEquals(stdXmlStreamReader.getCharacterEncodingScheme(), xmlSecurityStreamReader.getCharacterEncodingScheme());
assertEquals(stdXmlStreamReader.getEncoding(), xmlSecurityStreamReader.getEncoding());
- assertEquals(stdXmlStreamReader.getVersion(), xmlSecurityStreamReader.getVersion());
+ assertEquals("1.0", xmlSecurityStreamReader.getVersion());
break;
case XMLStreamConstants.END_DOCUMENT:
break;
