zorba-coders team mailing list archive

[Ghislain Fourny <ghislain.fourny@xxxxxxxxxx>]

Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/qnames-not-in-pool-fixes into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/qnames-not-in-pool-fixes/+merge/99705

Fixed code for QNames not in pool.
-- 
https://code.launchpad.net/~zorba-coders/zorba/qnames-not-in-pool-fixes/+merge/99705
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/store/naive/atomic_items.cpp'
--- src/store/naive/atomic_items.cpp	2012-03-27 00:56:11 +0000
+++ src/store/naive/atomic_items.cpp	2012-03-28 11:32:20 +0000
@@ -602,6 +602,7 @@
     const char* aPrefix,
     const char* aLocalName)
   :
+  theNormalizedQName(NULL),
   theIsInPool(false)
 {
   initializeAsQNameNotInPool(aNamespace, aPrefix, aLocalName);
@@ -613,6 +614,7 @@
     const zstring& aPrefix,
     const zstring& aLocalName)
   :
+  theNormalizedQName(NULL),
   theIsInPool(false)
 {
   initializeAsQNameNotInPool(aNamespace, aPrefix, aLocalName);

=== modified file 'src/store/naive/atomic_items.h'
--- src/store/naive/atomic_items.h	2012-03-27 00:56:11 +0000
+++ src/store/naive/atomic_items.h	2012-03-28 11:32:20 +0000
@@ -459,7 +459,7 @@
   bool isNormalized() const 
   {
     assert(theNormalizedQName != this || thePrefix.empty());
-    assert(theNormalizedQName == this || !thePrefix.empty());
+    assert(!theIsInPool || theNormalizedQName == this || !thePrefix.empty());
 
     return theNormalizedQName == this;
   }