diff --git a/src/xercesc/validators/datatype/AbstractNumericValidator.cpp b/src/xercesc/validators/datatype/AbstractNumericValidator.cpp
index d2e0e4f9f559cce9a6ef3ecaa598b221fef3d1e8..4e93ba045f07a136fdbc6580d835b64581056222 100644
--- a/src/xercesc/validators/datatype/AbstractNumericValidator.cpp
+++ b/src/xercesc/validators/datatype/AbstractNumericValidator.cpp
@@ -67,66 +67,57 @@ void AbstractNumericValidator::boundsCheck(const XMLNumber* const theDat
if (thisFacetsDefined == 0)
return;
- try
+ // must be < MaxExclusive
+ if ( (thisFacetsDefined & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0 )
{
-
- // must be < MaxExclusive
- if ( (thisFacetsDefined & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0 )
+ result = compareValues(theData, getMaxExclusive());
+ if ( result != -1)
{
- result = compareValues(theData, getMaxExclusive());
- if ( result != -1)
- {
- REPORT_VALUE_ERROR(theData
+ REPORT_VALUE_ERROR(theData
, getMaxExclusive()
, XMLExcepts::VALUE_exceed_maxExcl
, manager)
- }
- }
-
- // must be <= MaxInclusive
- if ( (thisFacetsDefined & DatatypeValidator::FACET_MAXINCLUSIVE) != 0 )
- {
- result = compareValues(theData, getMaxInclusive());
- if (result == 1)
- {
- REPORT_VALUE_ERROR(theData
- , getMaxInclusive()
- , XMLExcepts::VALUE_exceed_maxIncl
- , manager)
- }
}
+ }
- // must be >= MinInclusive
- if ( (thisFacetsDefined & DatatypeValidator::FACET_MININCLUSIVE) != 0 )
+ // must be <= MaxInclusive
+ if ( (thisFacetsDefined & DatatypeValidator::FACET_MAXINCLUSIVE) != 0 )
+ {
+ result = compareValues(theData, getMaxInclusive());
+ if (result == 1)
{
- result = compareValues(theData, getMinInclusive());
- if (result == -1)
- {
- REPORT_VALUE_ERROR(theData
- , getMinInclusive()
- , XMLExcepts::VALUE_exceed_minIncl
- , manager)
- }
+ REPORT_VALUE_ERROR(theData
+ , getMaxInclusive()
+ , XMLExcepts::VALUE_exceed_maxIncl
+ , manager)
}
+ }
- // must be > MinExclusive
- if ( (thisFacetsDefined & DatatypeValidator::FACET_MINEXCLUSIVE) != 0 )
+ // must be >= MinInclusive
+ if ( (thisFacetsDefined & DatatypeValidator::FACET_MININCLUSIVE) != 0 )
+ {
+ result = compareValues(theData, getMinInclusive());
+ if (result == -1)
{
- result = compareValues(theData, getMinExclusive());
- if (result != 1)
- {
- REPORT_VALUE_ERROR(theData
- , getMinExclusive()
- , XMLExcepts::VALUE_exceed_minExcl
- , manager)
- }
+ REPORT_VALUE_ERROR(theData
+ , getMinInclusive()
+ , XMLExcepts::VALUE_exceed_minIncl
+ , manager)
}
}
- catch (XMLException &e)
+
+ // must be > MinExclusive
+ if ( (thisFacetsDefined & DatatypeValidator::FACET_MINEXCLUSIVE) != 0 )
{
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::RethrowError, e.getMessage(), manager);
+ result = compareValues(theData, getMinExclusive());
+ if (result != 1)
+ {
+ REPORT_VALUE_ERROR(theData
+ , getMinExclusive()
+ , XMLExcepts::VALUE_exceed_minExcl
+ , manager)
+ }
}
-
}
const XMLCh* AbstractNumericValidator::getCanonicalRepresentation(const XMLCh* const rawData
diff --git a/src/xercesc/validators/datatype/AbstractStringValidator.cpp b/src/xercesc/validators/datatype/AbstractStringValidator.cpp
index c27c6a6c7b54f89bee80130699ce8c8887012366..e9ce311f7a18825770de177d140a99d35e4222b5 100644
--- a/src/xercesc/validators/datatype/AbstractStringValidator.cpp
+++ b/src/xercesc/validators/datatype/AbstractStringValidator.cpp
@@ -565,18 +565,6 @@ void AbstractStringValidator::checkContent( const XMLCh* const conte
// we check pattern first
if ( (thisFacetsDefined & DatatypeValidator::FACET_PATTERN ) != 0 )
{
- // lazy construction
- if (getRegex() ==0) {
- try {
- // REVISIT: cargillmem fMemoryManager or manager?
- setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
- }
- catch (XMLException &e)
- {
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::RethrowError, e.getMessage(), fMemoryManager);
- }
- }
-
if (getRegex()->matches(content, manager) ==false)
{
ThrowXMLwithMemMgr2(InvalidDatatypeValueException
diff --git a/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp b/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp
index be7da7533601cc691a9d105d028438b6af3768bf..3a7690ef22af5dfe9e1d8e5fc1e58cbaa69fce9f 100644
--- a/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp
@@ -95,17 +95,6 @@ void BooleanDatatypeValidator::checkContent( const XMLCh* const cont
// we check pattern first
if ( (getFacetsDefined() & DatatypeValidator::FACET_PATTERN ) != 0 )
{
- // lazy construction
- if (getRegex() ==0) {
- try {
- setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
- }
- catch (XMLException &e)
- {
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::RethrowError, e.getMessage(), fMemoryManager);
- }
- }
-
if (getRegex()->matches(content, manager) ==false)
{
ThrowXMLwithMemMgr2(InvalidDatatypeValueException
diff --git a/src/xercesc/validators/datatype/DatatypeValidator.cpp b/src/xercesc/validators/datatype/DatatypeValidator.cpp
index b6caa661a36366b429bf3e5ec303dacbd86a182f..6309cb6ab583eaeed5a8844033ce13892e5d52d2 100644
--- a/src/xercesc/validators/datatype/DatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DatatypeValidator.cpp
@@ -285,7 +285,7 @@ void DatatypeValidator::serialize(XSerializeEngine& serEng)
*
***/
XTemplateSerializer::loadObject(&fFacets, 29, true, serEng);
- serEng.readString(fPattern);
+ serEng.readString(fPattern);
/***
* Recreate through setTypeName()
@@ -323,7 +323,7 @@ void DatatypeValidator::serialize(XSerializeEngine& serEng)
/***
* don't serialize fRegex
***/
- fRegex = 0;
+ fRegex = new (fMemoryManager) RegularExpression(fPattern, SchemaSymbols::fgRegEx_XOption, fMemoryManager);
}
diff --git a/src/xercesc/validators/datatype/DatatypeValidator.hpp b/src/xercesc/validators/datatype/DatatypeValidator.hpp
index 455077ebed1bdae01cd577de21c2c6f939892b5b..5d042925d112fdcf9493aa1be8b183c92fddfd15 100644
--- a/src/xercesc/validators/datatype/DatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DatatypeValidator.hpp
@@ -667,9 +667,12 @@ inline void DatatypeValidator::setFixed(int fixed)
inline void DatatypeValidator::setPattern(const XMLCh* pattern)
{
- if (fPattern)
+ if (fPattern) {
fMemoryManager->deallocate(fPattern);//delete [] fPattern;
+ delete fRegex;
+ }
fPattern = XMLString::replicate(pattern, fMemoryManager);
+ fRegex = new (fMemoryManager) RegularExpression(fPattern, SchemaSymbols::fgRegEx_XOption, fMemoryManager);
}
inline void DatatypeValidator::setRegex(RegularExpression* const regex)
diff --git a/src/xercesc/validators/datatype/DateTimeValidator.cpp b/src/xercesc/validators/datatype/DateTimeValidator.cpp
index 44ac5462c6f3cb23f61596ea5519fe2316ae96f0..a683e792f7bad9b320d9d3cc04bc8ff1fd339c58 100644
--- a/src/xercesc/validators/datatype/DateTimeValidator.cpp
+++ b/src/xercesc/validators/datatype/DateTimeValidator.cpp
@@ -104,17 +104,6 @@ void DateTimeValidator::checkContent(const XMLCh* const content
// we check pattern first
if ( (thisFacetsDefined & DatatypeValidator::FACET_PATTERN ) != 0 )
{
- // lazy construction
- if (getRegex() ==0) {
- try {
- setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
- }
- catch (XMLException &e)
- {
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::RethrowError, e.getMessage(), fMemoryManager);
- }
- }
-
if (getRegex()->matches(content, manager) ==false)
{
ThrowXMLwithMemMgr2(InvalidDatatypeValueException
diff --git a/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp b/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
index f809f893c030eb7f1da2f6c014bcc4ed4dfba6bb..6c6f4154c255fe0d87e57fa771967d4c50035e6b 100644
--- a/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
@@ -398,18 +398,6 @@ void DecimalDatatypeValidator::checkContent(const XMLCh* const conte
// we check pattern first
if ( (thisFacetsDefined & DatatypeValidator::FACET_PATTERN ) != 0 )
{
- // lazy construction
- if (getRegex() ==0) {
- try {
- // REVISIT: cargillmem fMemoryManager vs manager
- setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
- }
- catch (XMLException &e)
- {
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::RethrowError, e.getMessage(), manager);
- }
- }
-
if (getRegex()->matches(content, manager) ==false)
{
ThrowXMLwithMemMgr2(InvalidDatatypeValueException
@@ -424,90 +412,78 @@ void DecimalDatatypeValidator::checkContent(const XMLCh* const conte
// all other facet were inherited by the derived type
if (asBase)
return;
- XMLCh *errorMsg = 0;
- try {
- XMLBigDecimal compareDataValue(content, manager);
- XMLBigDecimal* compareData = &compareDataValue;
+
+ XMLBigDecimal compareDataValue(content, manager);
+ XMLBigDecimal* compareData = &compareDataValue;
- if (getEnumeration())
+ if (getEnumeration())
+ {
+ int i=0;
+ int enumLength = getEnumeration()->size();
+ for ( ; i < enumLength; i++)
{
- int i=0;
- int enumLength = getEnumeration()->size();
- for ( ; i < enumLength; i++)
- {
- if (compareValues(compareData, (XMLBigDecimal*) getEnumeration()->elementAt(i)) ==0 )
- break;
- }
-
- if (i == enumLength)
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::VALUE_NotIn_Enumeration, content, manager);
+ if (compareValues(compareData, (XMLBigDecimal*) getEnumeration()->elementAt(i)) ==0 )
+ break;
}
- boundsCheck(compareData, manager);
+ if (i == enumLength)
+ ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::VALUE_NotIn_Enumeration, content, manager);
+ }
- if ( (thisFacetsDefined & DatatypeValidator::FACET_FRACTIONDIGITS) != 0 )
- {
- if ( compareData->getScale() > fFractionDigits )
- {
- XMLCh value1[BUF_LEN+1];
- XMLCh value2[BUF_LEN+1];
- XMLString::binToText(compareData->getScale(), value1, BUF_LEN, 10, manager);
- XMLString::binToText(fFractionDigits, value2, BUF_LEN, 10, manager);
- ThrowXMLwithMemMgr3(InvalidDatatypeFacetException
- , XMLExcepts::VALUE_exceed_fractDigit
- , compareData->getRawData()
- , value1
- , value2
- , manager);
- }
- }
+ boundsCheck(compareData, manager);
- if ( (thisFacetsDefined & DatatypeValidator::FACET_TOTALDIGITS) != 0 )
- {
- if ( compareData->getTotalDigit() > fTotalDigits )
- {
- XMLCh value1[BUF_LEN+1];
- XMLCh value2[BUF_LEN+1];
- XMLString::binToText(compareData->getTotalDigit(), value1, BUF_LEN, 10, manager);
- XMLString::binToText(fTotalDigits, value2, BUF_LEN, 10, manager);
- ThrowXMLwithMemMgr3(InvalidDatatypeFacetException
- , XMLExcepts::VALUE_exceed_totalDigit
- , compareData->getRawData()
- , value1
- , value2
- , manager);
- }
-
- /***
- E2-44 totalDigits
-
- ... by restricting it to numbers that are expressible as i 锟� 10^-n
- where i and n are integers such that |i| < 10^totalDigits and 0 <= n <= totalDigits.
- ***/
-
- if ( compareData->getScale() > fTotalDigits )
- {
- XMLCh value1[BUF_LEN+1];
- XMLCh value2[BUF_LEN+1];
- XMLString::binToText(compareData->getScale(), value1, BUF_LEN, 10, manager);
- XMLString::binToText(fTotalDigits, value2, BUF_LEN, 10, manager);
- ThrowXMLwithMemMgr3(InvalidDatatypeFacetException
- , XMLExcepts::VALUE_exceed_totalDigit
- , compareData->getRawData()
- , value1
- , value2
- , manager);
- }
- }
- }
- catch (XMLException &e)
+ if ( (thisFacetsDefined & DatatypeValidator::FACET_FRACTIONDIGITS) != 0 )
{
- errorMsg = XMLString::replicate(e.getMessage(), manager);
+ if ( compareData->getScale() > fFractionDigits )
+ {
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
+ XMLString::binToText(compareData->getScale(), value1, BUF_LEN, 10, manager);
+ XMLString::binToText(fFractionDigits, value2, BUF_LEN, 10, manager);
+ ThrowXMLwithMemMgr3(InvalidDatatypeFacetException
+ , XMLExcepts::VALUE_exceed_fractDigit
+ , compareData->getRawData()
+ , value1
+ , value2
+ , manager);
+ }
}
- if(errorMsg)
+
+ if ( (thisFacetsDefined & DatatypeValidator::FACET_TOTALDIGITS) != 0 )
{
- ArrayJanitor<XMLCh> jan(errorMsg, manager);
- ThrowXMLwithMemMgr1(InvalidDatatypeFacetException, XMLExcepts::RethrowError, errorMsg, manager);
+ if ( compareData->getTotalDigit() > fTotalDigits )
+ {
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
+ XMLString::binToText(compareData->getTotalDigit(), value1, BUF_LEN, 10, manager);
+ XMLString::binToText(fTotalDigits, value2, BUF_LEN, 10, manager);
+ ThrowXMLwithMemMgr3(InvalidDatatypeFacetException
+ , XMLExcepts::VALUE_exceed_totalDigit
+ , compareData->getRawData()
+ , value1
+ , value2
+ , manager);
+ }
+
+ /***
+ E2-44 totalDigits
+ ... by restricting it to numbers that are expressible as i 锟� 10^-n
+ where i and n are integers such that |i| < 10^totalDigits and 0 <= n <= totalDigits.
+ ***/
+
+ if ( compareData->getScale() > fTotalDigits )
+ {
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
+ XMLString::binToText(compareData->getScale(), value1, BUF_LEN, 10, manager);
+ XMLString::binToText(fTotalDigits, value2, BUF_LEN, 10, manager);
+ ThrowXMLwithMemMgr3(InvalidDatatypeFacetException
+ , XMLExcepts::VALUE_exceed_totalDigit
+ , compareData->getRawData()
+ , value1
+ , value2
+ , manager);
+ }
}
}
diff --git a/src/xercesc/validators/datatype/DoubleDatatypeValidator.cpp b/src/xercesc/validators/datatype/DoubleDatatypeValidator.cpp
index 90311bf655a0e5e50316533c084f333f15160137..f37b081030220f97f9acc4dea61ecbdc642a0df4 100644
--- a/src/xercesc/validators/datatype/DoubleDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DoubleDatatypeValidator.cpp
@@ -184,17 +184,6 @@ void DoubleDatatypeValidator::checkContent(const XMLCh* const conten
// we check pattern first
if ( (getFacetsDefined() & DatatypeValidator::FACET_PATTERN ) != 0 )
{
- // lazy construction
- if (getRegex() ==0) {
- try {
- setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
- }
- catch (XMLException &e)
- {
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::RethrowError, e.getMessage(), fMemoryManager);
- }
- }
-
if (getRegex()->matches(content, manager) ==false)
{
ThrowXMLwithMemMgr2(InvalidDatatypeValueException
@@ -210,32 +199,24 @@ void DoubleDatatypeValidator::checkContent(const XMLCh* const conten
if (asBase)
return;
- try {
- XMLDouble theValue(content, manager);
- XMLDouble *theData = &theValue;
+ XMLDouble theValue(content, manager);
+ XMLDouble *theData = &theValue;
- if (getEnumeration())
+ if (getEnumeration())
+ {
+ int i=0;
+ int enumLength = getEnumeration()->size();
+ for ( ; i < enumLength; i++)
{
- int i=0;
- int enumLength = getEnumeration()->size();
- for ( ; i < enumLength; i++)
- {
- if (compareValues(theData, (XMLDouble*) getEnumeration()->elementAt(i)) ==0 )
- break;
- }
-
- if (i == enumLength)
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::VALUE_NotIn_Enumeration, content, manager);
+ if (compareValues(theData, (XMLDouble*) getEnumeration()->elementAt(i)) ==0 )
+ break;
}
- boundsCheck(theData, manager);
-
- }
- catch (XMLException &e)
- {
- ThrowXMLwithMemMgr1(InvalidDatatypeFacetException, XMLExcepts::RethrowError, e.getMessage(), manager);
+ if (i == enumLength)
+ ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::VALUE_NotIn_Enumeration, content, manager);
}
+ boundsCheck(theData, manager);
}
/***
diff --git a/src/xercesc/validators/datatype/FloatDatatypeValidator.cpp b/src/xercesc/validators/datatype/FloatDatatypeValidator.cpp
index fbb073c73d12bbadf9e84496b6c5a75ecdb75fbb..8f82b883bf5dff1701a87d0a74e82b2b91d85473 100644
--- a/src/xercesc/validators/datatype/FloatDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/FloatDatatypeValidator.cpp
@@ -184,17 +184,6 @@ void FloatDatatypeValidator::checkContent(const XMLCh* const content
// we check pattern first
if ( (getFacetsDefined() & DatatypeValidator::FACET_PATTERN ) != 0 )
{
- // lazy construction
- if (getRegex() ==0) {
- try {
- setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
- }
- catch (XMLException &e)
- {
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::RethrowError, e.getMessage(), fMemoryManager);
- }
- }
-
if (getRegex()->matches(content, manager) ==false)
{
ThrowXMLwithMemMgr2(InvalidDatatypeValueException
@@ -210,31 +199,24 @@ void FloatDatatypeValidator::checkContent(const XMLCh* const content
if (asBase)
return;
- try {
- XMLFloat theValue(content, manager);
- XMLFloat *theData = &theValue;
+ XMLFloat theValue(content, manager);
+ XMLFloat *theData = &theValue;
- if (getEnumeration() != 0)
+ if (getEnumeration() != 0)
+ {
+ int i=0;
+ int enumLength = getEnumeration()->size();
+ for ( ; i < enumLength; i++)
{
- int i=0;
- int enumLength = getEnumeration()->size();
- for ( ; i < enumLength; i++)
- {
- if (compareValues(theData, (XMLFloat*) getEnumeration()->elementAt(i))==0)
- break;
- }
-
- if (i == enumLength)
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::VALUE_NotIn_Enumeration, content, manager);
+ if (compareValues(theData, (XMLFloat*) getEnumeration()->elementAt(i))==0)
+ break;
}
- boundsCheck(theData, manager);
- }
- catch (XMLException &e)
- {
- ThrowXMLwithMemMgr1(InvalidDatatypeFacetException, XMLExcepts::RethrowError, e.getMessage(), manager);
+ if (i == enumLength)
+ ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::VALUE_NotIn_Enumeration, content, manager);
}
+ boundsCheck(theData, manager);
}
/***
diff --git a/src/xercesc/validators/datatype/ListDatatypeValidator.cpp b/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
index 93ff501cba9e42ebafae941dcaeb0d712013dd07..0c89e7443a187aad2a28a844c872182180b7bee1 100644
--- a/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
@@ -150,18 +150,6 @@ void ListDatatypeValidator::checkContent( BaseRefVectorOf<XMLCh>* to
// we check pattern first
if ( (thisFacetsDefined & DatatypeValidator::FACET_PATTERN ) != 0 )
{
- // lazy construction
- if (getRegex() == 0)
- {
- try {
- setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
- }
- catch (XMLException &e)
- {
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::RethrowError, e.getMessage(), manager);
- }
- }
-
//check every item in the list as a whole
if (getRegex()->matches(content, manager) == false)
{
diff --git a/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.cpp b/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.cpp
index 1f32b52ba92e47b657896e712d6de9c8a74627bb..42224a468b1d5647fe48497bc937169d5d30a899 100644
--- a/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.cpp
@@ -96,18 +96,6 @@ void NOTATIONDatatypeValidator::checkContent( const XMLCh* const con
// we check pattern first
if ( (thisFacetsDefined & DatatypeValidator::FACET_PATTERN ) != 0 )
{
- // lazy construction
- if (getRegex() ==0) {
- try {
- // REVISIT: cargillmem fMemoryManager or manager?
- setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
- }
- catch (XMLException &e)
- {
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::RethrowError, e.getMessage(), fMemoryManager);
- }
- }
-
if (getRegex()->matches(content, manager) ==false)
{
ThrowXMLwithMemMgr2(InvalidDatatypeValueException
diff --git a/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp b/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp
index fff6328d5227255cd5f0cd6215df76cf35712862..498ab56686771160193d4a9f7f3d680f49d7583f 100644
--- a/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp
@@ -96,18 +96,6 @@ void QNameDatatypeValidator::checkContent( const XMLCh* const conten
// we check pattern first
if ( (thisFacetsDefined & DatatypeValidator::FACET_PATTERN ) != 0 )
{
- // lazy construction
- if (getRegex() ==0) {
- try {
- // REVISIT: cargillmem fMemoryManager or manager?
- setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
- }
- catch (XMLException &e)
- {
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::RethrowError, e.getMessage(), fMemoryManager);
- }
- }
-
if (getRegex()->matches(content, manager) ==false)
{
ThrowXMLwithMemMgr2(InvalidDatatypeValueException
diff --git a/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp b/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
index 8869cef4b93d183383ebf3bdc8864d8001d5ccd7..e88b3f6f27ebbc6f2e0ce5a5f0d6b5eaa0884d12 100644
--- a/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
@@ -281,18 +281,6 @@ void UnionDatatypeValidator::checkContent(const XMLCh* const content
// 1) and 2). we check pattern first
if ( (getFacetsDefined() & DatatypeValidator::FACET_PATTERN ) != 0 )
{
- // lazy construction
- if (getRegex() == 0)
- {
- try {
- setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
- }
- catch (XMLException &e)
- {
- ThrowXMLwithMemMgr1(InvalidDatatypeValueException, XMLExcepts::RethrowError, e.getMessage(), manager);
- }
- }
-
if (getRegex()->matches(content, manager) == false)
{
ThrowXMLwithMemMgr2(InvalidDatatypeValueException