From commits-return-51976-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Tue Sep 8 09:35:56 2020 Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with ESMTP id BE0FC196A0 for ; Tue, 8 Sep 2020 09:35:56 +0000 (UTC) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 4F94D1228A1 for ; Tue, 8 Sep 2020 09:35:56 +0000 (UTC) Received: (qmail 9159 invoked by uid 500); 8 Sep 2020 09:35:53 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 9075 invoked by uid 500); 8 Sep 2020 09:35:53 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 9002 invoked by uid 99); 8 Sep 2020 09:35:53 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Sep 2020 09:35:53 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id EC9A78087C; Tue, 8 Sep 2020 09:35:52 +0000 (UTC) Date: Tue, 08 Sep 2020 09:35:52 +0000 To: "commits@directory.apache.org" Subject: [directory-server] branch master updated: Fixing a few trivial issues identified by SpotBugs MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <159955775289.22726.581682461322162912@gitbox.apache.org> From: coheigea@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: directory-server X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 11a901f880195b3faaf5f9a7c3352b8545c6bd38 X-Git-Newrev: fabf91c375aff5542ee2aa92ef9cb9bcf050e2a2 X-Git-Rev: fabf91c375aff5542ee2aa92ef9cb9bcf050e2a2 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/directory-server.git The following commit(s) were added to refs/heads/master by this push: new fabf91c Fixing a few trivial issues identified by SpotBugs fabf91c is described below commit fabf91c375aff5542ee2aa92ef9cb9bcf050e2a2 Author: Colm O hEigeartaigh AuthorDate: Tue Sep 8 10:35:30 2020 +0100 Fixing a few trivial issues identified by SpotBugs --- .../apache/directory/server/core/factory/DSAnnotationProcessor.java | 2 +- .../java/org/apache/directory/shared/kerberos/KerberosUtils.java | 6 +++--- .../server/kerberos/kdc/ticketgrant/TicketGrantingService.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java b/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java index b5be49c..028808c 100644 --- a/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java +++ b/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java @@ -472,7 +472,7 @@ public final class DSAnnotationProcessor private static boolean isDn( String str ) { - if ( ( Strings.isEmpty( str ) ) | ( str.length() < 3 ) ) + if ( ( Strings.isEmpty( str ) ) || ( str.length() < 3 ) ) { return false; } diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosUtils.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosUtils.java index 43b3f21..23381c8 100644 --- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosUtils.java +++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosUtils.java @@ -389,11 +389,11 @@ public class KerberosUtils { String cipherName = Strings.toLowerCaseAscii( encType.getName() ); - for ( String c : cipherAlgoMap.keySet() ) + for ( Map.Entry entry : cipherAlgoMap.entrySet() ) { - if ( cipherName.startsWith( c ) ) + if ( cipherName.startsWith( entry.getKey() ) ) { - return cipherAlgoMap.get( c ); + return entry.getValue(); } } diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java index 1cd8797..54266b9 100644 --- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java +++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java @@ -322,7 +322,7 @@ public final class TicketGrantingService EncTicketPart encTicketPart = tgt.getEncTicketPart(); EncryptionKey sessionKey = encTicketPart.getKey(); - if ( authenticatorChecksum == null || authenticatorChecksum.getChecksumType() == null + if ( authenticatorChecksum.getChecksumType() == null || authenticatorChecksum.getChecksumValue() == null || bodyBytes == null ) { throw new KerberosException( ErrorType.KRB_AP_ERR_INAPP_CKSUM );