diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-21 13:55:29 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-05-31 14:52:13 +0200 |
| commit | aa81984614f5b53d3d9a94f06334cf94e1fc43ad (patch) | |
| tree | 93287b9513ad725b818a58d518fdd81551617474 | |
| parent | a0340855b3d92869ade4c48886685ff75fe17c8c (diff) | |
| download | otp-aa81984614f5b53d3d9a94f06334cf94e1fc43ad.tar.gz otp-aa81984614f5b53d3d9a94f06334cf94e1fc43ad.tar.bz2 otp-aa81984614f5b53d3d9a94f06334cf94e1fc43ad.zip | |
Don't call asn1ct_name:clear/0 directly after asn1ct_name:start/0
Ensure that asn1ct_name:start/0 will call asn1ct_name:clear/0 if the
name server process is already running so that we can be sure that
the variables are cleared.
| -rw-r--r-- | lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl | 3 | ||||
| -rw-r--r-- | lib/asn1/src/asn1ct_constructed_per.erl | 2 | ||||
| -rw-r--r-- | lib/asn1/src/asn1ct_name.erl | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl index 341a04761b..95086da7b1 100644 --- a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl +++ b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl @@ -183,7 +183,6 @@ gen_encode_sequence(Erules,Typename,D) when is_record(D,type) -> gen_decode_sequence(Erules,Typename,D) when is_record(D,type) -> asn1ct_name:start(), - asn1ct_name:clear(), asn1ct_name:new(tag), #'SEQUENCE'{tablecinf=TableConsInfo,components=CList0} = D#type.def, @@ -349,7 +348,6 @@ gen_encode_set(Erules,Typename,D) when is_record(D,type) -> gen_decode_set(Erules,Typename,D) when is_record(D,type) -> asn1ct_name:start(), - asn1ct_name:clear(), %% asn1ct_name:new(term), asn1ct_name:new(tag), #'SET'{tablecinf=TableConsInfo,components=TCompList0} = D#type.def, @@ -504,7 +502,6 @@ gen_encode_sof(Erules,Typename,_InnerTypename,D) when is_record(D,type) -> gen_decode_sof(Erules,TypeName,_InnerTypeName,D) when is_record(D,type) -> asn1ct_name:start(), - asn1ct_name:clear(), {SeqOrSetOf, _TypeTag, Cont} = case D#type.def of {'SET OF',_Cont} -> {'SET OF','SET',_Cont}; diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl index aa5ee18c80..06b315a86f 100644 --- a/lib/asn1/src/asn1ct_constructed_per.erl +++ b/lib/asn1/src/asn1ct_constructed_per.erl @@ -227,7 +227,6 @@ gen_decode_constructed(Erule, Typename, #type{}=D) -> Imm0 = gen_dec_constructed_imm(Erule, Typename, #type{}=D), Imm = opt_imm(Imm0), asn1ct_name:start(), - asn1ct_name:clear(), emit_gen_dec_imm(Imm), emit([".",nl,nl]). @@ -489,7 +488,6 @@ gen_encode_choice(Erule,Typename,D) when is_record(D,type) -> gen_decode_choice(Erules,Typename,D) when is_record(D,type) -> asn1ct_name:start(), - asn1ct_name:clear(), asn1ct_name:new(bytes), {'CHOICE',CompList} = D#type.def, Ext = extensible_enc(CompList), diff --git a/lib/asn1/src/asn1ct_name.erl b/lib/asn1/src/asn1ct_name.erl index c9709d352f..c0c2ed302c 100644 --- a/lib/asn1/src/asn1ct_name.erl +++ b/lib/asn1/src/asn1ct_name.erl @@ -38,7 +38,8 @@ start() -> end)), ok; _Pid -> - already_started + %% Already started. Clear the variables. + clear() end. name_server_loop({Ref, Parent} = Monitor,Vars) -> |