changeset 350:ab743e750ac6

Changed namespace awareness in XML parsing to use no auto-boxing. Fixed a stranged compilation bug with OpenJDK. artifacts/trunk@3311 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Wed, 23 Nov 2011 17:17:39 +0000
parents b3eb029e07dd
children eb1136134d09
files ChangeLog artifacts-common/src/main/java/de/intevation/artifacts/common/utils/XMLUtils.java
diffstat 2 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Nov 21 11:59:28 2011 +0000
+++ b/ChangeLog	Wed Nov 23 17:17:39 2011 +0000
@@ -1,3 +1,10 @@
+2011-11-21  Ingo Weinzierl <ingo@intevation.de>
+
+	* artifacts-common/src/main/java/de/intevation/artifacts/common/utils/XMLUtils.java:
+	  Changed Ingo's last commit to a more conservative notation (no auto-boxing).
+	  Strangely the flys-client does not compile for me with the auto-boxed
+	  syntax with OpenJDK!
+
 2011-11-21  Ingo Weinzierl <ingo@intevation.de>
 
 	* artifacts-common/src/main/java/de/intevation/artifacts/common/utils/XMLUtils.java:
--- a/artifacts-common/src/main/java/de/intevation/artifacts/common/utils/XMLUtils.java	Mon Nov 21 11:59:28 2011 +0000
+++ b/artifacts-common/src/main/java/de/intevation/artifacts/common/utils/XMLUtils.java	Wed Nov 23 17:17:39 2011 +0000
@@ -211,14 +211,17 @@
 
 
     public static final Document parseDocument(InputStream inputStream) {
-        return parseDocument(inputStream, true);
+        return parseDocument(inputStream, Boolean.TRUE);
     }
 
-    public static final Document parseDocument(InputStream inputStream, Boolean namespaceAware) {
+    public static final Document parseDocument(
+        InputStream inputStream,
+        Boolean     namespaceAware
+    ) {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 
         if (namespaceAware != null) {
-            factory.setNamespaceAware(namespaceAware);
+            factory.setNamespaceAware(namespaceAware.booleanValue());
         }
 
         try {

http://dive4elements.wald.intevation.org