diff --git a/CHANGELOG.md b/CHANGELOG.md index e4dffeafd..466f1331c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ All notable changes to the Zowe™ Explorer plug-in for IntelliJ IDEA™ will be * Bugfix: Topics handling ([25606368](https://github.com/zowe/zowe-explorer-intellij/commit/25606368)) * Bugfix: Zowe config v2 handling ([fd79b908](https://github.com/zowe/zowe-explorer-intellij/commit/fd79b908)) * Bugfix: JES Explorer bug when ABEND job is being displayed ([614aa6cf](https://github.com/zowe/zowe-explorer-intellij/commit/614aa6cf)) -* Bugfix: Conflicting VFS name ([63596855](https://github.com/zowe/zowe-explorer-intellij/commit/63596855)) +* Bugfix: Conflicting VFS and content storage name ([3a2c8d60](https://github.com/zowe/zowe-explorer-intellij/commit/3a2c8d60)) * Bugfix: GitHub issue #167: Zowe explorer config is not converted ([b5eae7a2](https://github.com/zowe/zowe-explorer-intellij/commit/b5eae7a2)) ## `1.1.1 (2023-11-23)` diff --git a/build.gradle.kts b/build.gradle.kts index 6db09de3a..ac5d038aa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -117,7 +117,7 @@ tasks {
  • Topics handling
  • Zowe config v2 handling
  • JES Explorer bug when ABEND job is being displayed
  • -
  • Conflicting VFS name
  • +
  • Conflicting VFS and content storage name
  • GitHub issue #167: Zowe explorer config is not converted
  • """ ) diff --git a/src/main/kotlin/org/zowe/explorer/dataops/content/synchronizer/RemoteAttributedContentSynchronizer.kt b/src/main/kotlin/org/zowe/explorer/dataops/content/synchronizer/RemoteAttributedContentSynchronizer.kt index 7dc22e093..0e63ab91f 100644 --- a/src/main/kotlin/org/zowe/explorer/dataops/content/synchronizer/RemoteAttributedContentSynchronizer.kt +++ b/src/main/kotlin/org/zowe/explorer/dataops/content/synchronizer/RemoteAttributedContentSynchronizer.kt @@ -16,12 +16,12 @@ import com.intellij.openapi.vfs.VirtualFile import org.zowe.explorer.dataops.DataOpsManager import org.zowe.explorer.dataops.attributes.FileAttributes import org.zowe.explorer.dataops.attributes.RemoteUssAttributes -import org.zowe.explorer.utils.* import org.zowe.explorer.editor.FileContentChangeListener +import org.zowe.explorer.utils.* import java.io.IOException import java.util.concurrent.ConcurrentHashMap -private const val SUCCESSFUL_CONTENT_STORAGE_NAME_PREFIX = "sync_storage_" +private const val SUCCESSFUL_CONTENT_STORAGE_NAME_PREFIX = "zowe_sync_storage_" private val log = logger>() /**