This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit 8d4aebb8362eef181c6dd9200f4844667f18041a Author: Jacques Le Roux <[email protected]> AuthorDate: Thu Dec 16 17:08:38 2021 +0100 Improved: Fix some bugs Spotbugs reports (OFBIZ-12386) In OFBizActiveDirectoryAuthenticationHandler class, removes the feeding of an unused var ctx In OFBizLdapAuthenticationHandler class, removes the feeding of an unused var ctx In AbstractReportThread class, fixes few typos --- .../OFBizActiveDirectoryAuthenticationHandler.java | 5 ++--- .../ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java | 7 ++++--- .../java/org/apache/ofbiz/htmlreport/AbstractReportThread.java | 8 +++----- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ldap/src/main/java/org/apache/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java b/ldap/src/main/java/org/apache/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java index a515e28..f98ddeb 100644 --- a/ldap/src/main/java/org/apache/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java +++ b/ldap/src/main/java/org/apache/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java @@ -29,10 +29,10 @@ import javax.naming.directory.InitialDirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apereo.cas.util.LdapUtils; -import org.ldaptive.LdapEntry; import org.apache.ofbiz.base.util.UtilXml; import org.apache.ofbiz.ldap.commons.AbstractOFBizAuthenticationHandler; +import org.apereo.cas.util.LdapUtils; +import org.ldaptive.LdapEntry; import org.w3c.dom.Element; @@ -107,7 +107,6 @@ public final class OFBizActiveDirectoryAuthenticationHandler extends AbstractOFB env.put(Context.SECURITY_PRINCIPAL, userDN); // specify the password env.put(Context.SECURITY_CREDENTIALS, password); - ctx = new InitialDirContext(env); } } } catch (NamingException e) { diff --git a/ldap/src/main/java/org/apache/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java b/ldap/src/main/java/org/apache/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java index 2e43ca8..daa6bd4 100644 --- a/ldap/src/main/java/org/apache/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java +++ b/ldap/src/main/java/org/apache/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java @@ -20,6 +20,7 @@ package org.apache.ofbiz.ldap.openldap; import java.util.Hashtable; + import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.NamingException; @@ -27,10 +28,11 @@ import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apereo.cas.util.LdapUtils; -import org.ldaptive.LdapEntry; + import org.apache.ofbiz.base.util.UtilXml; import org.apache.ofbiz.ldap.commons.AbstractOFBizAuthenticationHandler; +import org.apereo.cas.util.LdapUtils; +import org.ldaptive.LdapEntry; import org.w3c.dom.Element; /** @@ -92,7 +94,6 @@ public final class OFBizLdapAuthenticationHandler extends AbstractOFBizAuthentic env.put(Context.SECURITY_PRINCIPAL, userDN); // specify the password env.put(Context.SECURITY_CREDENTIALS, password); - ctx = new InitialDirContext(env); } } } catch (NamingException e) { diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java index dce52e5..757d9d1 100644 --- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java +++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java @@ -69,7 +69,7 @@ public abstract class AbstractReportThread extends Thread implements InterfaceRe } /** - * Adds an error object to the list of errors that occured during the report. + * Adds an error object to the list of errors that occurred during the report. * @param obj the error object */ public void addError(Object obj) { @@ -130,10 +130,8 @@ public abstract class AbstractReportThread extends Thread implements InterfaceRe } /** - * Returns true if this thread is already "doomed" to be deleted. - * A OFBiz deamon Thread (the "Grim Reaper") will collect all - * doomed Threads, i.e. threads that are not longer active for some - * time. + * Returns true if this thread is already "doomed" to be deleted. A OFBiz daemon Thread (the "Grim Reaper") will collect all doomed Threads, i.e. + * threads that are not longer active for some time. * @return true if this thread is already "doomed" to be deleted */ public synchronized boolean isDoomed() {
