@@ -5,7 +5,7 @@ module V3
55 class LastOperationStateFailed < StandardError
66 end
77
8- class OperationAborted < StandardError
8+ class OperationCancelled < StandardError
99 end
1010
1111 class ServiceInstanceAsyncJob < VCAP ::CloudController ::Jobs ::ReoccurringJob
@@ -51,8 +51,8 @@ def perform
5151 fail_and_raise! ( err . message ) unless restart_on_failure?
5252
5353 restart_job ( err . message || 'no error description returned by the broker' )
54- rescue OperationAborted
55- aborted !( service_instance . last_operation &.type )
54+ rescue OperationCancelled
55+ cancelled !( service_instance . last_operation &.type )
5656 rescue => err
5757 fail! ( err )
5858 end
@@ -114,7 +114,7 @@ def raise_if_cannot_proceed!
114114 return if operation_type == 'delete' && last_operation_type == 'create'
115115
116116 if service_instance . operation_in_progress? && last_operation_type != operation_type
117- aborted !( last_operation_type )
117+ cancelled !( last_operation_type )
118118 end
119119 end
120120
@@ -162,7 +162,7 @@ def record_event(service_instance, request_attrs)
162162 record_service_instance_event ( operation_type , service_instance , request_attrs )
163163 end
164164
165- def aborted !( operation_in_progress )
165+ def cancelled !( operation_in_progress )
166166 raise CloudController ::Errors ::ApiError . new_from_details ( 'UnableToPerform' , operation_type , "#{ operation_in_progress } in progress" )
167167 end
168168
0 commit comments