# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: matthias.brantner@28msec.com-20111019205634-\
#   tp8084rzc8sdgors
# target_branch: bzr+ssh://bazaar.launchpad.net/~zorba-\
#   coders/zorba/bug_872732/
# testament_sha1: ea28395050a59ddc5af90dcdce83ceecbd11cee2
# timestamp: 2011-10-19 13:56:48 -0700
# base_revision_id: sorin.marian.nasoi@gmail.com-20111013124650-\
#   rqgyx4wkwlf9vz3k
# 
# Begin patch
=== modified file 'src/runtime/qnames/qnames_impl.cpp'
--- src/runtime/qnames/qnames_impl.cpp	2011-10-13 12:14:52 +0000
+++ src/runtime/qnames/qnames_impl.cpp	2011-10-19 20:56:34 +0000
@@ -275,46 +275,36 @@
     store::Item_t& result,
     PlanState& planState) const
 {
-  store::Item_t itemPrefix, itemElem;
+  store::Item_t item;
   zstring resNs;
   zstring prefix;
   bool found = false;
-  store::NsBindings NamespaceBindings;
+  store::NsBindings namespaceBindings;
   store::NsBindings::const_iterator iter;
 
   PlanIteratorState* state;
   DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
 
-  if (!consumeNext(itemPrefix, theChildren[0].getp(), planState ))
-  {
-    prefix = "";
-  }
-  else
-  {
-    itemPrefix->getStringValue2(prefix);
+  if (consumeNext(item, theChildren[0].getp(), planState ))
+  {
+    item->getStringValue2(prefix);
     ascii::trim_whitespace(prefix);
-  }
-
-  if (!consumeNext(itemElem, theChildren[1].getp(), planState ))
-  {
-    ZORBA_ASSERT(false);
-  }
-  else
-  {
-    itemElem->getNamespaceBindings(NamespaceBindings);
-
-    for (iter = NamespaceBindings.begin();
-         iter != NamespaceBindings.end();
-         ++iter)
-    {
-      if (((*iter).first == prefix) &&
-          !(*iter).second.empty())
-        {
-          resNs = (*iter).second;
-          found = true;
-          break;
-        }
-    }
+  } // prefix is empty otherwise
+
+  consumeNext(item, theChildren[1].getp(), planState );
+  item->getNamespaceBindings(namespaceBindings);
+
+  for (iter = namespaceBindings.begin();
+       iter != namespaceBindings.end();
+       ++iter)
+  {
+    if (((*iter).first == prefix) &&
+        !(*iter).second.empty())
+      {
+        resNs = (*iter).second;
+        found = true;
+        break;
+      }
   }
 
   if (found)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVzLEBEAAg9fgFwQc3///1sj
CQq/7//6UASspmh7utjo1c7aaEkhJhA01MYk9TxFPaIR6TRoaBoNNGQSUBNNDJNNJqeap6EB6IAD
1NAAAEkEJAmBqmjzVHqB6h6gBoAyNMhoOaMmJgAmIwI0wIMRgmTAIwSSCmNAmnqjRNp6kZNPUPUx
GmAjACbUiEe+2vaOXp9/D9F+30Nci1MPoL33GI3ON08I0ibHK59q3TM6hJOkH6xfXzNWbzZu+nBh
mDp6AjqbEMQxnbje8zfFHfN3G58cZ9ju/57Hr2PbVeYrY5856qwXDGOhMFwbm2mOdn4kOZTpxSvw
qFumOujIZ9kOrEtQ2Sq2ltleKzFFaYJZcfTcdZvTCN+1OcFK5NOjqsr8BO2kDrDcky5Yz9JkAc8N
9GnJ3oOZjayG1BxUa4YQyRgepRXVAUuZ4tZJniamA8+3XZtjGOCHsU09dc12crRHHeZdDxF4hz8A
zeyexwTqupY0ON0J3X8mrVxdlFVrnoJ6YacVNRJnKxEBRKbIVuUInTUKpiM+aTjVEMOQlM/0rDvJ
kyEgdcmxIjsygoLQmvA+b9cxOsUk/tzOFudk02ScZZJpM/MMpRF407bnenUq2UMYzFJjXD23Qwdw
5waFIClfeuZjnc8U6MrVTUWrEvwazGknXuVvf6KWj2lNrikK3osTyFYsYYSNF0iiXxWUV2K9IV3O
v35GDnJTE0dE3CbIZotCBDbbO8sUU2FTLDZjRhQzLNj1HaK7GyTyNno1o0QO6arSVcJQje1C4dXF
2DGah3cXLs7Xb8RHo63viq25rjBLTqOkJ5mZN0bIRlZWEtxpgpGgn9uZNUTalk4N65NG9QFLsi1a
ROfNVTCoIz9bUvRgugHCUoN61EgiBGDvNpBvJkuWo38Ssypz8DjysZLvdelIqUvUpibpgugTZaUe
chrpg26dIzynfCCjgMUGi2SWJY4lpH+saJSrQuzwnyCtJBXEuKK0witTcuNWczQ4GnmLSOzHLltL
kUHwKUByfOqXhVWluW9HG3ctfd2bm9OlVTfW6xh9GKRX3yjMcEy0RTMifnc9LJdVzqVlSyWwHhxJ
VCI35bKl269VqtLbS4yLx32WTKt6w4s/foReSEncF4oxeaoLw51kZB5E4pnnUFyNoDY7Pimqj8ad
BZrCsoVCKlhT87Q1BxizPtFx454yC2vXqCkfNu9/f7LrlU1PRsTV/VVBOsA5K4JgmcDyCIk6TThG
+MvEMmbEOEN1dJ1DbuN6lYMkQeZ7IQIBYftJxFgoDjEj4eQWDrOFclrXAzCbxAOBwoovoVJVgHVm
W51hhftBwUgx7mJKZQlMVCF2xYPWNLowUDYwUkWbGMTyTE4ZSzBYwNcrCq/iN07mJsJODm0sk5Xp
h160lCOK345SuIb8g2GTOluKRbbPUNKiF7xazmyXbrUGHUpNDUkMWt94ruVLeKp3sYNkB0ls3BEK
0YJqmeEzEdkvl2kYFA55HWRH2o1sK6s+jLaeBQ66tXDAPsE5WmArnysUnK+YHaMqR07lCrxNmFQ7
E/ReZUX3UUQzGHBavypwFSUaFnNY3/F3JFOFCQXMsQEQ