1 files changed, 11 insertions, 3 deletions
diff --git a/libxsde/xsde/cxx/serializer/validating/name-stl.cxx b/libxsde/xsde/cxx/serializer/validating/name-stl.cxx
index 4541a21..97b0381 100644
--- a/libxsde/xsde/cxx/serializer/validating/name-stl.cxx
+++ b/libxsde/xsde/cxx/serializer/validating/name-stl.cxx
@@ -6,6 +6,7 @@
 #include <xsde/cxx/xml/char-table.hxx>
 
 #include <xsde/cxx/serializer/validating/name-stl.hxx>
+#include <xsde/cxx/serializer/validating/string-common.hxx>
 
 namespace xsde
 {
@@ -51,10 +52,17 @@ namespace xsde
             }
           }
 
-          if (ok)
-            _characters (tmp.c_str (), tmp.size ());
-          else
+          if (!ok)
+          {
             _schema_error (schema_error::invalid_name_value);
+            return;
+          }
+
+          if (!string_common::validate_facets (
+                tmp.c_str (), tmp.size (), _facets (), _context ()))
+            return;
+
+          _characters (tmp.c_str (), tmp.size ());
         }
       }
     }