update Base64.java : cleanup code, fix EmptyCatchBlock and LocalVariableName

dota17 · dota17 · commit d649f4b337f1 · 2020-08-29T12:07:40.000+08:00
diff --git a/src/main/java/org/java_websocket/util/Base64.java b/src/main/java/org/java_websocket/util/Base64.java
@@ -517,7 +517,7 @@ private static byte[] encode3to4(
       byte[] source, int srcOffset, int numSigBytes,
       byte[] destination, int destOffset, int options) {
 
-    byte[] ALPHABET = getAlphabet(options);
+    final byte[] ALPHABET = getAlphabet(options);
 
     //           1         2         3
     // 01234567890123456789012345678901 Bit position
@@ -691,18 +691,21 @@ public static byte[] encodeBytesToBytes(byte[] source, int off, int len, int opt
             gzos.close();
           }
         } catch (Exception e) {
+          // do nothing
         }
         try {
           if (b64os != null) {
             b64os.close();
           }
         } catch (Exception e) {
+          // do nothing
         }
         try {
           if (baos != null) {
             baos.close();
           }
         } catch (Exception e) {
+          // do nothing
         }
       }   // end finally
 
@@ -818,7 +821,7 @@ private static int decode4to3(
           destination.length, destOffset));
     }   // end if
 
-    byte[] DECODABET = getDecodabet(options);
+    final byte[] DECODABET = getDecodabet(options);
 
     // Example: Dk==
     if (source[srcOffset + 2] == EQUALS_SIGN) {

Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,7 @@ private static byte[] encode3to4(`
`517`	`517`	`byte[] source, int srcOffset, int numSigBytes,`
`518`	`518`	`byte[] destination, int destOffset, int options) {`
`519`	`519`
`520`		`- byte[] ALPHABET = getAlphabet(options);`
	`520`	`+ final byte[] ALPHABET = getAlphabet(options);`
`521`	`521`
`522`	`522`	`// 1 2 3`
`523`	`523`	`// 01234567890123456789012345678901 Bit position`
`@@ -691,18 +691,21 @@ public static byte[] encodeBytesToBytes(byte[] source, int off, int len, int opt`
`691`	`691`	`gzos.close();`
`692`	`692`	`}`
`693`	`693`	`} catch (Exception e) {`
	`694`	`+ // do nothing`
`694`	`695`	`}`
`695`	`696`	`try {`
`696`	`697`	`if (b64os != null) {`
`697`	`698`	`b64os.close();`
`698`	`699`	`}`
`699`	`700`	`} catch (Exception e) {`
	`701`	`+ // do nothing`
`700`	`702`	`}`
`701`	`703`	`try {`
`702`	`704`	`if (baos != null) {`
`703`	`705`	`baos.close();`
`704`	`706`	`}`
`705`	`707`	`} catch (Exception e) {`
	`708`	`+ // do nothing`
`706`	`709`	`}`
`707`	`710`	`} // end finally`
`708`	`711`
`@@ -818,7 +821,7 @@ private static int decode4to3(`
`818`	`821`	`destination.length, destOffset));`
`819`	`822`	`} // end if`
`820`	`823`
`821`		`- byte[] DECODABET = getDecodabet(options);`
	`824`	`+ final byte[] DECODABET = getDecodabet(options);`
`822`	`825`
`823`	`826`	`// Example: Dk==`
`824`	`827`	`if (source[srcOffset + 2] == EQUALS_SIGN) {`