Merge lp:~zorba-coders/zorba/bug-1032166 into lp:zorba

[Ghislain Fourny]

Fixes bug 1032166 (critical memory bug).

Fixes bug 1032166 (critical memory bug).

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1032166-2012-08-02T12-46-58.557Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-1032166 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug-1032166-2012-08-02T12-46-58.557Z is finished. The
  final status was:

  6 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1032166-2012-08-02T13-22-59.201Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1032166-2012-08-02T13-22-59.201Z 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.

[Ghislain Fourny (gislenius)]

I think it is not that critical - since the bug also was in addReference(), it only causes decrements and increments 2 by 2. It can probably wait the 2.7 release.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1032166-2012-08-02T20-08-58.124Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1032166-2012-08-02T20-08-58.124Z 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: 1 Approve, 1 Pending.

[Chris Hillery (ceejatec)]

May as well get it in.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1032166-2012-08-03T01-26-48.12Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1032166-2012-08-03T01-26-48.12Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/store/naive/item.cpp'
--- src/store/naive/item.cpp	2012-07-24 08:48:48 +0000
+++ src/store/naive/item.cpp	2012-08-02 13:23:19 +0000
@@ -73,6 +73,7 @@
     SYNC_CODE(static_cast<const simplestore::json::JSONItem*>(this)->getRCLock()->acquire());
     ++theRefCount;
     SYNC_CODE(static_cast<const simplestore::json::JSONItem*>(this)->getRCLock()->release());
+    return;
   }
 #endif
   case ATOMIC:
@@ -161,6 +162,7 @@
     }
 
     SYNC_CODE(static_cast<const simplestore::json::JSONItem*>(this)->getRCLock()->release());
+    return;
   }
 #endif
   case ATOMIC: