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

[Markos Zaharioudakis]

small fix in SimpleCollection::findNode()

small fix in SimpleCollection::findNode()

[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-28T16-08-07.289Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2013-02-28T16-08-07.289Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/store/naive/simple_collection.cpp'
--- src/store/naive/simple_collection.cpp	2013-02-21 15:29:59 +0000
+++ src/store/naive/simple_collection.cpp	2013-02-28 16:05:04 +0000
@@ -154,21 +154,22 @@
   try
   {
     pos = to_xs_unsignedInt(position);
-  } catch (const std::range_error&)
-  {
-    throw ZORBA_EXCEPTION(
-        zerr::ZXQD0004_INVALID_PARAMETER,
-        ERROR_PARAMS(ZED(ZXQD0004_NOT_WITHIN_RANGE), position)
-      );
-  }
-
-  StructuredItem* collectionItem =
-  static_cast<StructuredItem*>(theTrees[pos].getp());
-
-  if (pos < theTrees.size() &&
-      collectionItem->getTreeId() == structuredItem->getTreeId())
-  {
-    return true;
+  }
+  catch (const std::range_error&)
+  {
+    throw ZORBA_EXCEPTION(zerr::ZXQD0004_INVALID_PARAMETER,
+    ERROR_PARAMS(ZED(ZXQD0004_NOT_WITHIN_RANGE), position));
+  }
+
+  if (pos < theTrees.size())
+  {
+    StructuredItem* collectionItem =
+    static_cast<StructuredItem*>(theTrees[pos].getp());
+
+    if (collectionItem->getTreeId() == structuredItem->getTreeId())
+    {
+      return true;
+    }
   }
 
   csize numTrees = theTrees.size();