Skip to content

Commit a36f274

Browse files
Check for validity of conversation object was done on approval, but not on fail, inquire nor skip.
1 parent 7869c0c commit a36f274

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

connect/resources/fulfillment_automation.py

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -87,31 +87,34 @@ def dispatch(self, request):
8787
except InquireRequest as inquire:
8888
self.update_parameters(request.id, inquire.params)
8989
inquired = self.inquire(request.id)
90-
try:
91-
conversation.add_message(str(inquire))
92-
except TypeError as ex:
93-
logger.error('Error updating conversation for request {}: {}'
94-
.format(request.id, ex))
90+
if conversation:
91+
try:
92+
conversation.add_message(str(inquire))
93+
except TypeError as ex:
94+
logger.error('Error updating conversation for request {}: {}'
95+
.format(request.id, ex))
9596
return inquired
9697

9798
except FailRequest as fail:
9899
# PyCharm incorrectly detects unreachable code here, so disable
99100
# noinspection PyUnreachableCode
100101
failed = self.fail(request.id, reason=str(fail))
101-
try:
102-
conversation.add_message(str(fail))
103-
except TypeError as ex:
104-
logger.error('Error updating conversation for request {}: {}'
105-
.format(request.id, ex))
102+
if conversation:
103+
try:
104+
conversation.add_message(str(fail))
105+
except TypeError as ex:
106+
logger.error('Error updating conversation for request {}: {}'
107+
.format(request.id, ex))
106108
return failed
107109

108110
except SkipRequest as skip:
109111
skipped = skip.code
110-
try:
111-
conversation.add_message(str(skip))
112-
except TypeError as ex:
113-
logger.error('Error updating conversation for request {}: {}'
114-
.format(request.id, ex))
112+
if conversation:
113+
try:
114+
conversation.add_message(str(skip))
115+
except TypeError as ex:
116+
logger.error('Error updating conversation for request {}: {}'
117+
.format(request.id, ex))
115118
return skipped
116119

117120
@deprecated(deprecated_in='16.0', details='Use ``TierConfig.get`` instead.')

0 commit comments

Comments
 (0)