File 2566-snmp_generic-Future-proof-exception-handli... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2566-snmp_generic-Future-proof-exception-handling-code.patch of Package erlang (Revision c299f11dbd35366482a3c0e1f83a05c5)

Currently displaying revision c299f11dbd35366482a3c0e1f83a05c5 , Show latest

From 5d7e12f4d037f74602029850bbd29e38c3732b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 10 May 2017 07:25:50 +0200
Subject: [PATCH 4/4] snmp_generic: Future-proof exception handling code

In the future, erlang:get_stacktrace/0 will probably only work
inside a the 'catch' block of a 'try' expression.

Future-proof the code by rewriting the old-style catch to
a try...catch.
---
 lib/snmp/src/agent/snmp_generic.erl | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/snmp/src/agent/snmp_generic.erl b/lib/snmp/src/agent/snmp_generic.erl
index fc23e16ef..473852534 100644
--- a/lib/snmp/src/agent/snmp_generic.erl
+++ b/lib/snmp/src/agent/snmp_generic.erl
@@ -413,20 +413,21 @@ table_check_status(NameDb, Col, ?'RowStatus_createAndGo', RowIndex, Cols) ->
 	false -> 
 	    % it's ok to use snmpa_local_db:table_construct_row since it's
 	    % side effect free and we only use the result temporary.
-	    case catch snmpa_local_db:table_construct_row(
+	    try snmpa_local_db:table_construct_row(
 			 NameDb, RowIndex, ?'RowStatus_createAndGo', Cols) of
-		{'EXIT', _Reason} ->
-		    ?vtrace(
-		       "failed construct row (createAndGo): "
-		       "~n   Reason: ~p"
-		       "~n   Stack:  ~p",
-		       [_Reason, erlang:get_stacktrace()]),
-		    {noCreation, Col}; % Bad RowIndex
 		Row ->
 		    case lists:member(noinit, tuple_to_list(Row)) of
 			false -> {noError, 0};
 			_Found -> {inconsistentValue, Col}
 		    end
+            catch
+                _:_Reason ->
+		    ?vtrace(
+		       "failed construct row (createAndGo): "
+		       "~n   Reason: ~p"
+		       "~n   Stack:  ~p",
+		       [_Reason, erlang:get_stacktrace()]),
+		    {noCreation, Col}           % Bad RowIndex
 	    end;
 	true -> {inconsistentValue, Col}
     end;
@@ -435,17 +436,18 @@ table_check_status(NameDb, Col, ?'RowStatus_createAndGo', RowIndex, Cols) ->
 table_check_status(NameDb, Col, ?'RowStatus_createAndWait', RowIndex, Cols) ->
     case table_row_exists(NameDb, RowIndex) of
 	false ->
-	    case catch snmpa_local_db:table_construct_row(
+	    try snmpa_local_db:table_construct_row(
 			 NameDb, RowIndex, ?'RowStatus_createAndGo', Cols) of
-		{'EXIT', _Reason} ->
+		_Row ->
+		    {noError, 0}
+            catch
+                _:_Reason ->
 		    ?vtrace(
 		       "failed construct row (createAndWait): "
 		       "~n   Reason: ~p"
 		       "~n   Stack:  ~p",
 		       [_Reason, erlang:get_stacktrace()]),
-		    {noCreation, Col}; % Bad RowIndex
-		_Row ->
-		    {noError, 0}
+		    {noCreation, Col}           % Bad RowIndex
 	    end;
 	true -> {inconsistentValue, Col}
     end;
-- 
2.13.0

Places

File 2566-snmp_generic-Future-proof-exception-handling-code.patch of Package erlang (Revision c299f11dbd35366482a3c0e1f83a05c5)

Places