Repository: commons-crypto Updated Branches: refs/heads/master 7171e28c5 -> 24e32ee97
Simplify: no need to check for null (done by splitClassNames). Drop unnecessary line breaks Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/24e32ee9 Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/24e32ee9 Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/24e32ee9 Branch: refs/heads/master Commit: 24e32ee97aeb6fad777fc431f8accbe4105c30aa Parents: 7171e28 Author: Sebb <s...@apache.org> Authored: Sun Jun 26 00:49:51 2016 +0100 Committer: Sebb <s...@apache.org> Committed: Sun Jun 26 00:49:51 2016 +0100 ---------------------------------------------------------------------- .../crypto/random/CryptoRandomFactory.java | 35 ++++++++------------ 1 file changed, 14 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/24e32ee9/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java b/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java index 4becf83..0b775be 100644 --- a/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java +++ b/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java @@ -51,33 +51,26 @@ public class CryptoRandomFactory { */ public static CryptoRandom getCryptoRandom(Properties props) throws GeneralSecurityException { - String cryptoRandomClasses = props - .getProperty(SECURE_RANDOM_CLASSES_KEY); + String cryptoRandomClasses = props.getProperty(SECURE_RANDOM_CLASSES_KEY); if (cryptoRandomClasses == null) { - cryptoRandomClasses = System - .getProperty(SECURE_RANDOM_CLASSES_KEY); + cryptoRandomClasses = System.getProperty(SECURE_RANDOM_CLASSES_KEY); } StringBuilder errorMessage = new StringBuilder(); CryptoRandom random = null; - if (cryptoRandomClasses != null) { - for (String klassName : Utils.splitClassNames(cryptoRandomClasses, - ",")) { - try { - final Class<?> klass = ReflectionUtils - .getClassByName(klassName); - random = (CryptoRandom) ReflectionUtils.newInstance(klass, - props); - if (random != null) { - break; - } - } catch (ClassCastException e) { - errorMessage.append("Class: [" + klassName + "] is not a " + - "CryptoCipher."); - } catch (ClassNotFoundException e) { - errorMessage.append("CryptoCipher: [" + klassName + "] " + - "not " + "found."); + for (String klassName : Utils.splitClassNames(cryptoRandomClasses, ",")) { + try { + final Class<?> klass = ReflectionUtils.getClassByName(klassName); + random = (CryptoRandom) ReflectionUtils.newInstance(klass, props); + if (random != null) { + break; } + } catch (ClassCastException e) { + errorMessage.append("Class: [" + klassName + "] is not a " + + "CryptoCipher."); + } catch (ClassNotFoundException e) { + errorMessage.append("CryptoCipher: [" + klassName + "] " + + "not " + "found."); } }
