Author: borisk
Date: Tue Jul 15 00:57:44 2008
New Revision: 676823
URL: http://svn.apache.org/viewvc?rev=676823&view=rev
Log:
Require the exact match for the schema loader and storer version
Modified:
xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.cpp
xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.cpp
xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp
xerces/c/trunk/src/xercesc/util/XMLExceptMsgs.hpp
Modified: xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml?rev=676823&r1=676822&r2=676823&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml (original)
+++ xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml Tue Jul 15
00:57:44 2008
@@ -790,7 +790,7 @@
<Message Id="XSer_GrammarPool_Empty" Text="grammar pool is
empty"/>
<Message Id="XSer_GrammarPool_NotEmpty" Text="grammar pool is
not empty"/>
<Message Id="XSer_StringPool_NotEmpty" Text="string pool is
not empty"/>
- <Message Id="XSer_Storer_NewerThan_Loader" Text="storer level
'{0}' is newer than loader level '{1}'"/>
+ <Message Id="XSer_Storer_Loader_Mismatch" Text="storer level
'{0}' does not match loader level '{1}'"/>
<Message Id="VALUE_QName_Invalid2" Text="undefined
prefix in QName value '{0}'"/>
</FatalError>
</MsgDomain>
Modified: xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.cpp?rev=676823&r1=676822&r2=676823&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.cpp Tue Jul 15 00:57:44
2008
@@ -195,9 +195,7 @@
serEng.readString(fPublicId);
serEng.readString(fSystemId);
serEng.readString(fBaseURI);
- // when fIsExternal has been added, XERCES_GRAMMAR_SERIALIZATION_LEVEL
has been bumped to 6
- if(serEng.getStorerLevel()>=6)
- serEng>>fIsExternal;
+ serEng>>fIsExternal;
}
}
Modified: xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.cpp?rev=676823&r1=676822&r2=676823&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.cpp Tue Jul 15
00:57:44 2008
@@ -302,11 +302,11 @@
//version information
unsigned int StorerLevel;
serEng>>StorerLevel;
- serEng.fStorerLevel = (short)StorerLevel;
+ serEng.fStorerLevel = StorerLevel;
- //if the storer level is after the loader level
- //the loader shall not read the data any more
- if (StorerLevel > (unsigned int) XERCES_GRAMMAR_SERIALIZATION_LEVEL)
+ // The storer level must match the loader level.
+ //
+ if (StorerLevel != (unsigned int)XERCES_GRAMMAR_SERIALIZATION_LEVEL)
{
XMLCh StorerLevelChar[5];
XMLCh LoaderLevelChar[5];
@@ -314,7 +314,7 @@
XMLString::binToText(XERCES_GRAMMAR_SERIALIZATION_LEVEL,
LoaderLevelChar, 4, 10, memMgr);
ThrowXMLwithMemMgr2(XSerializationException
- , XMLExcepts::XSer_Storer_NewerThan_Loader
+ , XMLExcepts::XSer_Storer_Loader_Mismatch
, StorerLevelChar
, LoaderLevelChar
, memMgr);
Modified: xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp?rev=676823&r1=676822&r2=676823&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp Tue Jul 15
00:57:44 2008
@@ -165,7 +165,7 @@
* Return: level
*
***/
- inline unsigned short getStorerLevel() const;
+ inline unsigned int getStorerLevel() const;
/***
*
@@ -658,7 +658,7 @@
// fMapCount:
//
-------------------------------------------------------------------------------
const short fStoreLoad;
- short fStorerLevel;
+ unsigned int fStorerLevel;
XMLGrammarPool* const fGrammarPool;
BinInputStream* const fInputStream;
@@ -796,7 +796,7 @@
}
inline
-unsigned short XSerializeEngine::getStorerLevel() const
+unsigned int XSerializeEngine::getStorerLevel() const
{
return fStorerLevel;
}
Modified: xerces/c/trunk/src/xercesc/util/XMLExceptMsgs.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLExceptMsgs.hpp?rev=676823&r1=676822&r2=676823&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLExceptMsgs.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLExceptMsgs.hpp Tue Jul 15 00:57:44 2008
@@ -375,7 +375,7 @@
, XSer_GrammarPool_Empty = 359
, XSer_GrammarPool_NotEmpty = 360
, XSer_StringPool_NotEmpty = 361
- , XSer_Storer_NewerThan_Loader = 362
+ , XSer_Storer_Loader_Mismatch = 362
, VALUE_QName_Invalid2 = 363
, F_HighBounds = 364
, E_LowBounds = 365
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
