← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/release_barrier.cc

  • Committer: Brian Aker
  • Date: 2010-12-17 00:08:06 UTC
  • mfrom: (2002.1.4 clean)
  • Revision ID: brian@tangent.org-20101217000806-fa6kmggjnhsl4q85
Rollup for field encapsulation, monty fix for bzrignore, and Andrew bug
fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/release_barrier.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
22
 
#include <plugin/user_locks/module.h>
23
 
#include <plugin/user_locks/barrier_storage.h>
 
21
#include "config.h"
 
22
#include "plugin/user_locks/module.h"
 
23
#include "plugin/user_locks/barrier_storage.h"
24
24
 
25
25
#include <string>
26
26
 
39
39
  }
40
40
 
41
41
 
42
 
  drizzled::identifier::User::const_shared_ptr user_identifier(getSession().user());
43
 
 
44
 
  barriers::return_t result= Barriers::getInstance().release(Key(*user_identifier, res->c_str()), getSession().getSessionId());
 
42
  barriers::return_t result= Barriers::getInstance().release(Key(getSession().getSecurityContext(), res->c_str()), getSession().getSessionId());
45
43
 
46
44
  switch (result)
47
45
  {
57
55
 
58
56
        return 0;
59
57
      }
60
 
      list->erase(Key(*user_identifier, res->c_str()));
 
58
      list->erase(Key(getSession().getSecurityContext(), res->c_str()));
61
59
      null_value= false;
62
60
 
63
61
      return 1;