From 3a2c8d60c3dd62eeb4a23ecf7a27720cd6d18f56 Mon Sep 17 00:00:00 2001
From: Uladzislau <leksilonchikk@gmail.com>
Date: Fri, 19 Jan 2024 11:52:33 +0100
Subject: [PATCH] Fix for content storage name

Signed-off-by: Uladzislau <leksilonchikk@gmail.com>
---
 CHANGELOG.md                                                  | 2 +-
 build.gradle.kts                                              | 2 +-
 .../synchronizer/RemoteAttributedContentSynchronizer.kt       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 773b6dbc1..c7e1493d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ All notable changes to the Zowe IntelliJ Plugin will be documented in this file.
 * 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 ([63596855](https://github.com/zowe/zowe-explorer-intellij/commit/63596855))
 * 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 0e36626eb..bae454655 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -117,7 +117,7 @@ tasks {
         <li>Topics handling</li>
         <li>Zowe config v2 handling</li>
         <li>JES Explorer bug when ABEND job is being displayed</li>
-        <li>Conflicting VFS name</li>
+        <li>Conflicting VFS and content storage name</li>
         <li>GitHub issue #167: Zowe explorer config is not converted</li>
       </ul>"""
     )
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<RemoteAttributedContentSynchronizer<*>>()
 
 /**