From 4276d70d2dc448fcd873445760c9f32c665b405d Mon Sep 17 00:00:00 2001
From: arthenice Salting and Multiple Hash Iterations
* Because simple hashing is usually not good enough for secure applications, this class also supports 'salting'
* and multiple hash iterations. Please read this excellent
- * Hashing Java article to learn about
+ * Hashing Java article to learn about
* salting and multiple iterations and why you might want to use them. (Note of sections 5
* "Why add salt?" and 6 "Hardening against the attacker's attack").
Collection of Strings
- * ({@link java.util.Collection Collection}<{@link String String}>), typically each element being the Role name.
+ * ({@link java.util.Collection Collection}<{@link String String}>), typically each element being the Role name.
*
* {@link Permission Permission}s are provided in two ways:
* nullall configured realms, or null (the default)
* if all realm instances will each configure their own permission resolver.
*
- * @return the PermissionResolver to be used on all configured realms, or nullall configured realms, or null (the default)
* if realm instances will each configure their own permission resolver.
* @since 1.0
*/
@@ -145,10 +145,10 @@ protected void applyPermissionResolverToRealms() {
}
/**
- * Returns the RolePermissionResolver to be used on all configured realms, or nullall configured realms, or null (the default)
* if all realm instances will each configure their own permission resolver.
*
- * @return the RolePermissionResolver to be used on all configured realms, or nullall configured realms, or null (the default)
* if realm instances will each configure their own role permission resolver.
* @since 1.0
*/
diff --git a/core/src/main/java/org/apache/shiro/realm/ldap/LdapUtils.java b/core/src/main/java/org/apache/shiro/realm/ldap/LdapUtils.java
index ba12a2a28f..e03998c57c 100644
--- a/core/src/main/java/org/apache/shiro/realm/ldap/LdapUtils.java
+++ b/core/src/main/java/org/apache/shiro/realm/ldap/LdapUtils.java
@@ -86,8 +86,8 @@ public static Collection
- * select * from sessions s where s.lastAccessTimestamp < ? and s.stopTimestamp is null
+ * select * from sessions s where s.lastAccessTimestamp < ? and s.stopTimestamp is null
*
* where the {@code ?} parameter is a date instance equal to 'now' minus the session timeout
* (e.g. now - 30 minutes).
diff --git a/core/src/main/java/org/apache/shiro/subject/Subject.java b/core/src/main/java/org/apache/shiro/subject/Subject.java
index 7b1c83f967..b01dae04d8 100644
--- a/core/src/main/java/org/apache/shiro/subject/Subject.java
+++ b/core/src/main/java/org/apache/shiro/subject/Subject.java
@@ -351,7 +351,7 @@ public interface Subject {
* Although the underlying implementation determines exactly how this method functions, most implementations have
* this method act as the logical equivalent to this code:
*
- * {@link #getPrincipal() getPrincipal()} != null && !{@link #isAuthenticated() isAuthenticated()}
+ * {@link #getPrincipal() getPrincipal()} != null && !{@link #isAuthenticated() isAuthenticated()}
*
* Note as indicated by the above code example, if a {@code Subject} is remembered, they are
* NOT considered authenticated. A check against {@link #isAuthenticated() isAuthenticated()} is a more
diff --git a/core/src/main/java/org/apache/shiro/util/JavaEnvironment.java b/core/src/main/java/org/apache/shiro/util/JavaEnvironment.java
index 5d752d2789..1735a5b0ec 100644
--- a/core/src/main/java/org/apache/shiro/util/JavaEnvironment.java
+++ b/core/src/main/java/org/apache/shiro/util/JavaEnvironment.java
@@ -119,7 +119,7 @@ public static String getVersion() {
/**
* Get the major version code. This means we can do things like
- * if (getMajorVersion() < JAVA_14).
+ * if (getMajorVersion() < JAVA_14).
*
* @return a code comparable to the JAVA_XX codes in this class
* @see #JAVA_13