[java-identity-provider] branch master updated: Minor javadoc cleanup
Rod Widdowson
rdw at steadingsoftware.com
Sat May 25 11:33:42 EDT 2019
This is an automated email from the git hooks/post-receive script.
rdw 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=0571d4c932db7951aaae8ed598d26ad5823d5fb7
The following commit(s) were added to refs/heads/master by this push:
new 0571d4c Minor javadoc cleanup
0571d4c is described below
commit 0571d4c932db7951aaae8ed598d26ad5823d5fb7
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat May 25 16:33:46 2019 +0100
Minor javadoc cleanup
---
.../main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java | 4 ++--
.../net/shibboleth/idp/saml/metadata/impl/ScopesNodeProcessor.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
index a043c79..52e21f4 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
@@ -81,13 +81,13 @@ public class ScopesContainer {
}
/** Does the provided string match the scopes for this XMLObject?.
- * <br/> We test against the non regexp scopes for the sake of performance.
+ * <br/> We test first against the non regexp scopes for the sake of performance.
* @param scope what to test.
* @return whether it matches any of the scopes.
*/
public boolean matchesScope(@Nonnull @NotEmpty final String scope) {
final String strippedScope = StringSupport.trimOrNull(scope);
- Constraint.isNotNull(strippedScope, "ScopesContainer#matchesScope() requires nonnul or empty Scope");
+ Constraint.isNotNull(strippedScope, "ScopesContainer#matchesScope() requires non null or empty Scope");
if (simpleScopes.contains(strippedScope)) {
return true;
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ScopesNodeProcessor.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ScopesNodeProcessor.java
index 6bc907c..7c65055 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ScopesNodeProcessor.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ScopesNodeProcessor.java
@@ -52,6 +52,7 @@ public class ScopesNodeProcessor implements MetadataNodeProcessor {
} else {
return;
}
+
if (extensions == null) {
return;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list