diff options
| author | Niclas Eklund <[email protected]> | 2010-10-19 16:06:53 +0200 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2010-10-19 16:06:53 +0200 |
| commit | f420f36b3d9b8360250cc0c0d7e9a0c9e2341e45 (patch) | |
| tree | 615dcf1679299ac354ef9bb8f511268c89e3775c /lib/asn1/test/test_undecoded_rest.erl | |
| parent | 64df27c91db991550bdd6c97862eb26c1c9e37bf (diff) | |
| parent | 0f727bd7b72b009eac169c2e9ef925d3c2ffa409 (diff) | |
| download | otp-f420f36b3d9b8360250cc0c0d7e9a0c9e2341e45.tar.gz otp-f420f36b3d9b8360250cc0c0d7e9a0c9e2341e45.tar.bz2 otp-f420f36b3d9b8360250cc0c0d7e9a0c9e2341e45.zip | |
Merge branch 'maint-r13' of super:otp into nick/orber/corbaloc_http/OTP-8900
Diffstat (limited to 'lib/asn1/test/test_undecoded_rest.erl')
| -rw-r--r-- | lib/asn1/test/test_undecoded_rest.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/asn1/test/test_undecoded_rest.erl b/lib/asn1/test/test_undecoded_rest.erl index c7762d28f7..d2c98e130d 100644 --- a/lib/asn1/test/test_undecoded_rest.erl +++ b/lib/asn1/test/test_undecoded_rest.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2004-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 2004-2010. All Rights Reserved. +%% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% %% @@ -39,10 +39,10 @@ test(Opt) -> ?line {ok,Msg} = asn1ct:value('P-Record','PersonnelRecord'), ?line {ok,Bytes} = asn1_wrapper:encode('P-Record','PersonnelRecord',Msg), Bytes2 = - fun(B) when list(B) -> + fun(B) when is_list(B) -> B ++ [55,55,55]; - (B) when binary(B) -> - concat_binary([B,<<55,55,55>>]) + (B) when is_binary(B) -> + erlang:list_to_binary([B,<<55,55,55>>]) end (Bytes), case Opt of |