aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-03-02 10:08:57 +0100
committerSiri Hansen <[email protected]>2016-03-02 10:08:57 +0100
commit278d6f901e1380bf1764c129b8418ea3d181e8e3 (patch)
tree5ff240f82a5ed0f3c70a441601b33f06b07c308a /lib
parentbb7d36b9d23f0f6c882ee349c0005f88c0dadcfc (diff)
parent0d527441af4d2721d4b2d98a100d9e810a90fc22 (diff)
downloadotp-278d6f901e1380bf1764c129b8418ea3d181e8e3.tar.gz
otp-278d6f901e1380bf1764c129b8418ea3d181e8e3.tar.bz2
otp-278d6f901e1380bf1764c129b8418ea3d181e8e3.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/src/ct_conn_log_h.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl
index f7615fdc14..93f358462d 100644
--- a/lib/common_test/src/ct_conn_log_h.erl
+++ b/lib/common_test/src/ct_conn_log_h.erl
@@ -117,7 +117,7 @@ write_report(Time,#conn_log{module=ConnMod}=Info,Data,GL,State) ->
ok;
{LogType,Fd} ->
case format_data(ConnMod,LogType,Data) of
- [] ->
+ [] when Info#conn_log.action==send; Info#conn_log.action==recv ->
ok;
FormattedData ->
io:format(Fd,"~n~ts~ts~ts",[format_head(ConnMod,LogType,Time),