summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/modules/contribution-xml
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.x/modules/contribution-xml')
-rw-r--r--branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java b/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java
index 70398deaa9..d326324a5d 100644
--- a/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java
+++ b/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java
@@ -6,15 +6,15 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.tuscany.sca.contribution.processor.xml;
@@ -60,7 +60,7 @@ public class XMLDocumentStreamReader implements XMLStreamReader {
}
this.realReader = realReader;
-
+
if (realReader instanceof XMLFragmentStreamReader) {
((XMLFragmentStreamReader)realReader).init();
}
@@ -142,7 +142,11 @@ public class XMLDocumentStreamReader implements XMLStreamReader {
}
public String getCharacterEncodingScheme() {
+ if (isDelegating()) {
return realReader.getCharacterEncodingScheme();
+ } else {
+ return "UTF-8";
+ }
}
public String getElementText() throws XMLStreamException {
@@ -412,7 +416,7 @@ public class XMLDocumentStreamReader implements XMLStreamReader {
state = STATE_COMPLETED;
} else if (!realReader.hasNext()) {
state = STATE_COMPLETE_AT_NEXT;
- }
+ }
if (fragment && returnEvent == END_ELEMENT) {
level--;
if (level == -1) {