Hi Vijay,

Please fix indentation before you push the patch.
Ack from me.

Anders Bjornerstedt is not reviewing patches (ack or nack), but participates 
with giving comments in OpenSAF and IMM.

Thanks,
Zoran

-----Original Message-----
From: Vijay Roy [mailto:[email protected]] 
Sent: den 18 oktober 2017 12:11
To: Zoran Milinkovic <[email protected]>
Cc: [email protected]; Vijay Roy <[email protected]>
Subject: [PATCH 1/1] amf: immxml-configure utility (tool) is failing with UTF-8 
encoding [#2632]

The fix is to support UTF-8 unicode validatoin for both UPPER_CASE (UTF-8) and 
lower_case (utf-8)
---
 src/imm/tools/immxml-merge | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/imm/tools/immxml-merge b/src/imm/tools/immxml-merge index 
8c17a4d..4c8d18d 100755
--- a/src/imm/tools/immxml-merge
+++ b/src/imm/tools/immxml-merge
@@ -318,7 +318,8 @@ class MergedImmDocument(BaseImmDocument):
             
         ## FIX for minidom problem with lost encoding info in saved xml 
document
         trace("encoding in first source xml document:%s", 
self.firstSourceDoc.encoding)
-        if self.firstSourceDoc.encoding == "utf-8":
+       if self.firstSourceDoc.encoding is not None and \
+           self.firstSourceDoc.encoding.lower() == "utf-8":
             xml_as_string = self.document.toxml("utf-8")
             #xml_as_string = self.document.toprettyxml("", "", "utf-8")
         else:
--
1.9.1


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to