diff options
| author | Kenneth Lundin <[email protected]> | 2012-03-29 17:16:31 +0200 |
|---|---|---|
| committer | Kenneth Lundin <[email protected]> | 2012-03-29 17:17:39 +0200 |
| commit | 6a3780b940c9406a48df6d55a0623e6d01892ac4 (patch) | |
| tree | 358719f79a59d8d58fb3d91dd3effa6d257af533 /lib/asn1/src/asn1ct.erl | |
| parent | e1dda02164dfff667c7247502de442195a4b7d42 (diff) | |
| parent | f2802b90d02f41079dd7db4e14dbe9b6fea91255 (diff) | |
| download | otp-6a3780b940c9406a48df6d55a0623e6d01892ac4.tar.gz otp-6a3780b940c9406a48df6d55a0623e6d01892ac4.tar.bz2 otp-6a3780b940c9406a48df6d55a0623e6d01892ac4.zip | |
Merge branch 'kenneth/asn1/integer_range/OTP-9946' into maint
* kenneth/asn1/integer_range/OTP-9946:
replace 5 sec timeout (too short) with monitor in asn1_db requests
Correct handling of INTEGER (1..4 | 8 | 10 | 20)
Diffstat (limited to 'lib/asn1/src/asn1ct.erl')
| -rw-r--r-- | lib/asn1/src/asn1ct.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl index 2d17f73a2c..99755a95a6 100644 --- a/lib/asn1/src/asn1ct.erl +++ b/lib/asn1/src/asn1ct.erl @@ -816,7 +816,9 @@ check({true,M},File,OutFile,Includes,EncodingRule,DbFile,Options,InputMods) -> asn1_db:dbsave(DbFile,M#module.name), verbose("--~p--~n",[{generated,DbFile}],Options), {true,{M,NewM,GenTypeOrVal}} - end + end; + ErrorList = {error,_} -> + {false,ErrorList} end; check({false,M},_,_,_,_,_,_,_) -> {false,M}. |