Skip to content

Commit c927aa8

Browse files
author
Dzianis Lisiankou
committed
Merge branch 'bugfix/IJMP-1949' into 'release/v1.2.3-221'
IJMP-1949: fix sending multiple rename requests See merge request ijmp/for-mainframe!588
2 parents edfaf56 + f5a04cf commit c927aa8

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

src/main/kotlin/eu/ibagroup/formainframe/dataops/operations/RenameOperationRunner.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class RenameOperationRunner(private val dataOpsManager: DataOpsManager) : Operat
6868
) {
6969
when (val attributes = operation.attributes) {
7070
is RemoteDatasetAttributes -> {
71-
attributes.requesters.map {
71+
attributes.requesters.forEach {
7272
try {
7373
progressIndicator.checkCanceled()
7474
val response = api<DataAPI>(it.connectionConfig).renameDataset(
@@ -84,6 +84,7 @@ class RenameOperationRunner(private val dataOpsManager: DataOpsManager) : Operat
8484
runWriteActionInEdtAndWait {
8585
operation.file.rename(this, operation.newName)
8686
}
87+
return
8788
} else {
8889
throw CallException(response, "Unable to rename the selected dataset")
8990
}
@@ -98,7 +99,7 @@ class RenameOperationRunner(private val dataOpsManager: DataOpsManager) : Operat
9899
}
99100
is RemoteMemberAttributes -> {
100101
val parentAttributes = dataOpsManager.tryToGetAttributes(attributes.parentFile) as RemoteDatasetAttributes
101-
parentAttributes.requesters.map {
102+
parentAttributes.requesters.forEach {
102103
try {
103104
progressIndicator.checkCanceled()
104105
log.info("Checking for duplicate names in dataset ${parentAttributes.datasetInfo.name}")
@@ -117,7 +118,7 @@ class RenameOperationRunner(private val dataOpsManager: DataOpsManager) : Operat
117118
).cancelByIndicator(progressIndicator).execute()
118119
if (!response.isSuccessful) {
119120
throw CallException(response, "Unable to duplicate the selected member")
120-
}
121+
} else return
121122
} else {
122123
val response = api<DataAPI>(it.connectionConfig).renameDatasetMember(
123124
authorizationToken = it.connectionConfig.authToken,
@@ -134,6 +135,7 @@ class RenameOperationRunner(private val dataOpsManager: DataOpsManager) : Operat
134135
runWriteActionInEdtAndWait {
135136
operation.file.rename(this, operation.newName)
136137
}
138+
return
137139
} else {
138140
throw CallException(response, "Unable to rename the selected member")
139141
}
@@ -149,7 +151,7 @@ class RenameOperationRunner(private val dataOpsManager: DataOpsManager) : Operat
149151
}
150152
is RemoteUssAttributes -> {
151153
val parentDirPath = attributes.parentDirPath
152-
attributes.requesters.map {
154+
attributes.requesters.forEach {
153155
try {
154156
progressIndicator.checkCanceled()
155157
val response = api<DataAPI>(it.connectionConfig).moveUssFile(
@@ -163,6 +165,7 @@ class RenameOperationRunner(private val dataOpsManager: DataOpsManager) : Operat
163165
runWriteActionInEdtAndWait {
164166
operation.file.rename(this, operation.newName)
165167
}
168+
return
166169
} else {
167170
throw CallException(response, "Unable to rename the selected file or directory")
168171
}

0 commit comments

Comments
 (0)