Merge lp:~zorba-coders/zorba/store-shutdown-set-numusers-zero into lp:zorba

[Ghislain Fourny]

Setting number of users to zero also in case of forced shutdown.

Setting number of users to zero also in case of forced shutdown.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/store-shutdown-set-numusers-zero-2012-03-20T13-40-05.668Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job store-shutdown-set-numusers-zero-2012-03-20T13-40-05.668Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Pending.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Till Westmann (tillw)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/store-shutdown-set-numusers-zero-2012-03-20T15-23-02.437Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job store-shutdown-set-numusers-zero-2012-03-20T15-23-02.437Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/store/naive/simple_store.cpp'
--- src/store/naive/simple_store.cpp	2012-03-14 15:28:15 +0000
+++ src/store/naive/simple_store.cpp	2012-03-20 13:39:19 +0000
@@ -376,7 +376,9 @@
     // LIBXML_TEST_VERSION if he wants to use libxml2
     // beyond the lifecycle of zorba
     xmlCleanupParser();
-
+    
+    theNumUsers = 0;
+    
     StoreManagerImpl::theStore = NULL;
   }
 }