[java-identity-provider] branch master updated: Checkstyle warnings.
Scott Cantor
cantor.2 at osu.edu
Mon Nov 19 12:07:08 EST 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=b3376ed925048b6e5e81c73a17cc08cc68e2fd92
The following commit(s) were added to refs/heads/master by this push:
new b3376ed Checkstyle warnings.
b3376ed is described below
commit b3376ed925048b6e5e81c73a17cc08cc68e2fd92
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 19 12:07:06 2018 -0500
Checkstyle warnings.
---
.../idp/saml/saml2/profile/impl/ProcessLogoutRequest.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java
index 362bb0c..f478ccd 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java
@@ -430,6 +430,7 @@ public class ProcessLogoutRequest extends AbstractProfileAction {
return false;
}
+// Checkstyle: CyclomaticComplexity OFF
/**
* Check if the {@link SPSession} has the appropriate service ID and SessionIndex.
*
@@ -452,15 +453,18 @@ public class ProcessLogoutRequest extends AbstractProfileAction {
// allow the qualifiers to be defaulted. If the formats don't match
// the eventual check will fail anyway.
String format = saml2Session.getNameID().getFormat();
- if (format == null)
+ if (format == null) {
format = NameID.UNSPECIFIED;
+ }
if (NameID.PERSISTENT.equals(format) || NameID.TRANSIENT.equals(format)
|| qualifiedNameIDFormats.contains(format)) {
- if (assertingParty == null)
+ if (assertingParty == null) {
assertingParty = assertingPartyLookupStrategy.apply(profileRequestContext);
- if (relyingParty == null)
+ }
+ if (relyingParty == null) {
relyingParty = relyingPartyLookupStrategy.apply(profileRequestContext);
+ }
if (!SAML2ObjectSupport.areNameIDsEquivalent(logoutRequest.getNameID(), saml2Session.getNameID(),
assertingParty, relyingParty)) {
@@ -486,5 +490,6 @@ public class ProcessLogoutRequest extends AbstractProfileAction {
return false;
}
+// Checkstyle: CyclomaticComplexity ON
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list