1 files changed, 11 insertions, 4 deletions
diff --git a/libxsde/xsde/cxx/serializer/validating/normalized-string-stl.cxx b/libxsde/xsde/cxx/serializer/validating/normalized-string-stl.cxx
index b7ccde7..cf1bbc0 100644
--- a/libxsde/xsde/cxx/serializer/validating/normalized-string-stl.cxx
+++ b/libxsde/xsde/cxx/serializer/validating/normalized-string-stl.cxx
@@ -4,6 +4,7 @@
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsde/cxx/serializer/validating/normalized-string-stl.hxx>
+#include <xsde/cxx/serializer/validating/string-common.hxx>
 
 namespace xsde
 {
@@ -35,13 +36,19 @@ namespace xsde
               break;
           }
 
-          if (*s == '\0')
-            _characters (tmp.c_str (), tmp.size ());
-          else
+          if (*s != '\0')
+          {
             _schema_error (schema_error::invalid_normalized_string_value);
+            return;
+          }
+
+          if (!string_common::validate_facets (
+                tmp.c_str (), tmp.size (), _facets (), _context ()))
+            return;
+
+          _characters (tmp.c_str (), tmp.size ());
         }
       }
     }
   }
 }
-