From 9dadfed42ee8d5bf8da7c29c816e0713ec0da624 Mon Sep 17 00:00:00 2001 From: handy Date: Tue, 9 May 2023 13:48:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=94=81=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=92=8C=20=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84int=E6=8B=86?= =?UTF-8?q?=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hutool/core/cache/impl/ReentrantCache.java | 2 +- .../java/org/dromara/hutool/core/net/Ipv4Util.java | 2 +- .../hutool/crypto/symmetric/SymmetricCrypto.java | 11 ++++------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/ReentrantCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/ReentrantCache.java index 4886c4964..3c9b01b60 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/ReentrantCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/ReentrantCache.java @@ -144,8 +144,8 @@ public abstract class ReentrantCache extends AbstractCache { * @param withMissCount 是否计数丢失数 */ private void remove(final K key, final boolean withMissCount) { - lock.lock(); CacheObj co; + lock.lock(); try { co = removeWithoutLock(key, withMissCount); } finally { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java index 07ba4cf78..f05ea3965 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java @@ -365,7 +365,7 @@ public class Ipv4Util implements Ipv4Pool { * @return 掩码位，例如 24 * @throws IllegalArgumentException 子网掩码非法 */ - public static int getMaskBitByMask(final String mask) { + public static Integer getMaskBitByMask(final String mask) { final Integer maskBit = MaskBit.getMaskBit(mask); Assert.notNull(maskBit, "Invalid netmask：{}", mask); return maskBit; diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricCrypto.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricCrypto.java index a71829dcb..4f843f933 100644 --- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricCrypto.java +++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/symmetric/SymmetricCrypto.java @@ -302,9 +302,8 @@ public class SymmetricCrypto implements SymmetricEncryptor, SymmetricDecryptor, * @since 6.0.0 */ public byte[] encrypt(final byte[] data, final byte[] salt) { - lock.lock(); - byte[] result; + lock.lock(); try { final Cipher cipher = initMode(Cipher.ENCRYPT_MODE, salt); result = cipher.doFinal(paddingDataWithZero(data, cipher.getBlockSize())); @@ -318,9 +317,8 @@ public class SymmetricCrypto implements SymmetricEncryptor, SymmetricDecryptor, @Override public void encrypt(final InputStream data, final OutputStream out, final boolean isClose) throws IORuntimeException { - lock.lock(); - CipherOutputStream cipherOutputStream = null; + lock.lock(); try { final Cipher cipher = initMode(Cipher.ENCRYPT_MODE, null); cipherOutputStream = new CipherOutputStream(out, cipher); @@ -358,10 +356,9 @@ public class SymmetricCrypto implements SymmetricEncryptor, SymmetricDecryptor, public byte[] decrypt(final byte[] bytes) { final int blockSize; final byte[] decryptData; - lock.lock(); - final byte[] salt = SaltMagic.getSalt(bytes); try { + final byte[] salt = SaltMagic.getSalt(bytes); final Cipher cipher = initMode(Cipher.DECRYPT_MODE, salt); blockSize = cipher.getBlockSize(); decryptData = cipher.doFinal(SaltMagic.getData(bytes)); @@ -376,8 +373,8 @@ public class SymmetricCrypto implements SymmetricEncryptor, SymmetricDecryptor, @Override public void decrypt(final InputStream data, final OutputStream out, final boolean isClose) throws IORuntimeException { - lock.lock(); CipherInputStream cipherInputStream = null; + lock.lock(); try { final Cipher cipher = initMode(Cipher.DECRYPT_MODE, null); cipherInputStream = new CipherInputStream(data, cipher);