Changeset 11879 in josm for trunk

Timestamp:

2017-04-10T03:28:15+02:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - EI_EXPOSE_REP

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/conflict/pair/ComparePairType.java (modified) (3 diffs)
• io/CacheCustomContent.java (modified) (3 diffs)
• io/auth/CredentialsAgentResponse.java (modified) (1 diff)
• tools/HttpClient.java (modified) (2 diffs)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java

@@ -10 +10 @@
 /**
  * Enumeration of the possible comparison pairs
- *
+ * @since 1650
  */
 public enum ComparePairType {
@@ -48 +48 @@
 
     /**
-     * replies true, if <code>role</code> is participating in this comparison
-     * pair
+     * replies true, if <code>role</code> is participating in this comparison pair
      *
      * @param role  the list role
-     * @return true, if <code>role</code> is participating in this comparison
-     * pair; false, otherwise
+     * @return true, if <code>role</code> is participating in this comparison pair; false, otherwise
      */
     public boolean isParticipatingIn(ListRole role) {
@@ -63 +61 @@
 
     /**
-     * replies the pair of {@link ListRole}s participating in this comparison
-     * pair
+     * replies the pair of {@link ListRole}s participating in this comparison pair
      *
      * @return  the pair of list roles
      */
     public ListRole[] getParticipatingRoles() {
-        return participatingRoles;
+        return Utils.copyArray(participatingRoles);
     }
 
     /**
-     * replies the opposite role of <code>role</code> participating in this comparison
-     * pair
+     * replies the opposite role of <code>role</code> participating in this comparison pair
      *
      * @param role one of the two roles in this pair

trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -136 +137 @@
      * @throws T if an error occurs
      */
-    public byte[] updateForce() throws T {
+    private byte[] updateForce() throws T {
         this.data = updateData();
         saveToDisk();
@@ -162 +163 @@
             loadFromDisk();
         }
-        return data;
+        return Utils.copyArray(data);
     }
 

trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java

@@ -40 +40 @@
      */
     public char[] getPassword() {
-        return password;
+        return Utils.copyArray(password);
     }
 

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -14 +14 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -559 +558 @@
      */
     public HttpClient setRequestBody(byte[] requestBody) {
-        this.requestBody = Arrays.copyOf(requestBody, requestBody.length);
+        this.requestBody = Utils.copyArray(requestBody);
         return this;
     }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -357 +357 @@
 
     /**
+     * Copies the given array. Unlike {@link Arrays#copyOf}, this method is null-safe.
+     * @param array The array to copy
+     * @return A copy of the original array, or {@code null} if {@code array} is null
+     * @since 11879
+     */
+    public static byte[] copyArray(byte... array) {
+        if (array != null) {
+            return Arrays.copyOf(array, array.length);
+        }
+        return array;
+    }
+
+    /**
      * Simple file copy function that will overwrite the target file.
      * @param in The source file