Fix write-to-read-only array issues (#210 and #207).

groboclown · Feb 27, 2020 · 5499d09 · 5499d09
1 parent 1c6c6e5
commit 5499d09
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,7 @@
 # IDEA Community VCS Integration for Perforce
 
 
-## ::v0.10.13::
+## ::v0.10.13:: and ::v0.10.14::
 
 ### Overview
 
@@ -10,7 +10,7 @@
 ### Details
 
 * Bug fixes
-    * Fixed a problem where a write is performed to a read-only list (#210 and )
+    * Fixed a problem where a write is performed to a read-only list (#210 and #207).
 
 
 ## ::v0.10.12::

diff --git a/...ver/impl/src/main/java/net/groboclown/p4/server/impl/connection/ConnectCommandRunner.java b/...ver/impl/src/main/java/net/groboclown/p4/server/impl/connection/ConnectCommandRunner.java
@@ -669,7 +669,7 @@ private AddEditResult addEditFile(IClient client, ClientConfig config, AddEditAc
         MessageStatusUtil.throwIfMessageOrEmpty(addFile ? "add" : "edit", ret);
 
         P4ChangelistId retChange;
-        if (action.getChangelistId() == null ||
+        if (action.getChangelistId() == null || ret.isEmpty() ||
                 action.getChangelistId().getChangelistId() != ret.get(0).getChangelistId()) {
             int retChangeId = ret.get(0).getChangelistId();
             if (retChangeId == IChangelist.UNKNOWN) {
@@ -923,7 +923,7 @@ private ListOpenedFilesChangesResult listOpenedFilesChanges(IClient client, Clie
             for (IChangelistSummary summary : summaries) {
                 IChangelist cl = cmd.getChangelistDetails(client.getServer(), summary.getId());
                 changes.add(cl);
-                List<IFileSpec> clFiles = cl.getFiles(false);
+                List<IFileSpec> clFiles = new ArrayList<>(cl.getFiles(false));
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("listOpenedFilesChanges: Fetched @" + cl.getId() + " files " + clFiles);
                 }

diff --git a/plugin-v3/src/main/resources/META-INF/plugin.xml b/plugin-v3/src/main/resources/META-INF/plugin.xml
@@ -1,13 +1,13 @@
 <idea-plugin>
     <name>Perforce IDEA Community Integration</name>
     <id>PerforceIC</id>
-    <version>0.10.13</version>
+    <version>0.10.14</version>
     <!-- see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html -->
     <idea-version since-build="171"/>
     <category>VCS Integration</category>
     <change-notes><![CDATA[
     <ul>
-      <li><em>0.10.13</em><ul>
+      <li><em>0.10.13 and 0.10.14</em><ul>
         <li>Quick patch to incorrect "add" to a read-only list.</li>
       </ul></li>
       <li><em>0.10.12</em><ul>