shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lhazlew...@apache.org
Subject svn commit: r1002319 - /incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/ldap/JndiLdapContextFactory.java
Date Tue, 28 Sep 2010 18:48:57 GMT
Author: lhazlewood
Date: Tue Sep 28 18:48:57 2010
New Revision: 1002319

URL: http://svn.apache.org/viewvc?rev=1002319&view=rev
Log:
Minor spelling fixes

Modified:
    incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/ldap/JndiLdapContextFactory.java

Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/ldap/JndiLdapContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/ldap/JndiLdapContextFactory.java?rev=1002319&r1=1002318&r2=1002319&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/ldap/JndiLdapContextFactory.java
(original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/ldap/JndiLdapContextFactory.java
Tue Sep 28 18:48:57 2010
@@ -436,7 +436,7 @@ public class JndiLdapContextFactory impl
 
     /**
      * This implementation returns an LdapContext based on the configured JNDI/LDAP environment
configuration.
-     * The environmet (Map) used at runtime is created by merging the default/configured
+     * The environnmet (Map) used at runtime is created by merging the default/configured
      * {@link #getEnvironment() environment template} with some runtime values as necessary
(e.g. a principal and
      * credential available at runtime only).
      * <p/>
@@ -464,7 +464,7 @@ public class JndiLdapContextFactory impl
 
         Object authcMech = getAuthenticationMechanism();
         if (authcMech == null && (principal != null || credentials != null)) {
-            //No authenticationMechanism has not been set, but either a principal and/or
credentials were
+            //authenticationMechanism has not been set, but either a principal and/or credentials
were
             //supplied, indicating that at least a 'simple' authentication attempt is indeed
occurring - the Shiro
             //end-user just didn't configure it explicitly.  So we set it to be 'simple'
here as a convenience;
             //the Sun provider implementation already does this same logic, but by repeating
that logic here, we ensure



Mime
View raw message