Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

[Markos Zaharioudakis]

optimized ref counting in JSONObjectNamesIterator::nextImpl()

optimized ref counting in JSONObjectNamesIterator::nextImpl()

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-02-16T16-53-58.353Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2013-02-16T16-53-58.353Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/runtime/json/jsoniq_functions_impl.cpp'
--- src/runtime/json/jsoniq_functions_impl.cpp	2013-02-12 03:55:18 +0000
+++ src/runtime/json/jsoniq_functions_impl.cpp	2013-02-16 16:44:28 +0000
@@ -884,7 +884,6 @@
   PlanState& planState) const
 {
   store::Item_t input;
-  store::Item_t key;
 
   JSONObjectNamesIteratorState* state;
   DEFAULT_STACK_INIT(JSONObjectNamesIteratorState, state, planState);
@@ -894,9 +893,8 @@
   state->theNames = input->getObjectKeys();
   state->theNames->open();
 
-  while (state->theNames->next(key))
+  while (state->theNames->next(result))
   {
-    result = key;
     STACK_PUSH (true, state);
   }
   state->theNames = NULL;