server: fixed broken work on network's non-compress mode (-Dxmage.net…

…work.nocompress)

Mage.Common/src/main/java/mage/utils/CompressUtil.java

@@ -4,57 +4,31 @@
 import mage.remote.traffic.ZippedObjectImpl;
 
 /**
- * Helps to compress and decompress data if needed.
+ * Helps to compress and decompress network data
  *
  * @author ayrat
  */
 public final class CompressUtil {
 
-    /**
-     * Defines should data be compressed or not. True by default. Read from
-     * system property:
-     */
-    private static boolean compressData;
-
-    /**
-     * Defines the system property name to disable any compressing.
-     */
-    private static final String NO_COMPRESS_DATA_PROPERTY = "nocompress";
+    // disable data compression in client-server traffic, add java param like -Dxmage.network.nocompress
+    private static final String NO_COMPRESS_DATA_PROPERTY = "xmage.network.nocompress";
+    private static final boolean compressData;
 
     static {
         compressData = System.getProperty(NO_COMPRESS_DATA_PROPERTY) == null;
     }
 
-    /**
-     * Hidden constructor
-     */
-    private CompressUtil() {
-    }
-
-    /**
-     * Decompress data, but only if it was compressed previously return original
-     * object otherwise.
-     *
-     * @param data Data to decompress
-     * @return Decompressed object
-     */
     public static Object decompress(Object data) {
         if (!(data instanceof ZippedObject)) {
             return data;
         }
         return ((ZippedObject) data).unzip();
     }
 
-    /**
-     * Compress data.
-     *
-     * @param data Data to compress
-     * @return Compressed object
-     */
     public static Object compress(Object data) {
         if (data != null && compressData) {
             return new ZippedObjectImpl<>(data);
         }
-        return null;
+        return data;
     }
 }