← Back to branch summary

~rdoering/ubuntu/intrepid/erlang/fix-535090

« back to all changes in this revision

Viewing changes to lib/cosTransactions/src/ETraP_Server_impl.erl

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2007-05-01 16:57:10 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20070501165710-2sapk0hp2gf3o0ip
Tags: 1:11.b.4-2ubuntu1
* Merge with Debian Unstable. Remaining changes:
  - Add -fno-stack-protector to fix broken crypto_drv.
* DebianMaintainerField update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/cosTransactions/src/ETraP_Server_impl.erl
1498
1498
 
1499
1499
test_exc(#exc{mixed = true}, _, _, {Env, Local}) ->
1500
1500
    {reply, {'EXCEPTION', ?tr_mixed}, {Env, ?etr_set_exc(Local, ?tr_mixed)}};
1501
 
test_exc(#exc{rollback = true}, commit, _, {Env, Local}) ->
1502
 
    {reply, {'EXCEPTION', ?tr_mixed}, {Env, ?etr_set_exc(Local, ?tr_mixed)}};
1503
 
test_exc(#exc{commit = true}, rollback, _, {Env, Local}) ->
1504
 
    {reply, {'EXCEPTION', ?tr_mixed}, {Env, ?etr_set_exc(Local, ?tr_mixed)}};
 
1501
% Left out for now to avoid dialyzer warning.
 
1502
%test_exc(#exc{rollback = true}, commit, _, {Env, Local}) ->
 
1503
%    {reply, {'EXCEPTION', ?tr_mixed}, {Env, ?etr_set_exc(Local, ?tr_mixed)}};
 
1504
% Left out for now to avoid dialyzer warning.
 
1505
%test_exc(#exc{commit = true}, rollback, _, {Env, Local}) ->
 
1506
%    {reply, {'EXCEPTION', ?tr_mixed}, {Env, ?etr_set_exc(Local, ?tr_mixed)}};
1505
1507
test_exc(#exc{hazard = true}, _, _, {Env, Local}) ->
1506
1508
    {reply, {'EXCEPTION', ?tr_hazard}, {Env, ?etr_set_exc(Local, ?tr_hazard)}};
1507
1509
test_exc(_, _, {'EXCEPTION', E}, {Env, Local})