[java-identity-provider] 02/02: IDP-1905 Ignore keys without values

Rod Widdowson rdw at steadingsoftware.com
Fri Mar 4 14:01:41 UTC 2022


This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=be8de30c0c7f7e9928b7fcc284014972e5dfd87b

commit be8de30c0c7f7e9928b7fcc284014972e5dfd87b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 4 14:00:42 2022 +0000

    IDP-1905 Ignore keys without values
    
    https://shibboleth.atlassian.net/browse/IDP-1905
    
    Add support for Jetty extensions: bare keys and lines starting '--'
---
 .../java/net/shibboleth/idp/installer/PropertiesWithComments.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/PropertiesWithComments.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/PropertiesWithComments.java
index f393adf8e..e3b5ad561 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/PropertiesWithComments.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/PropertiesWithComments.java
@@ -177,10 +177,11 @@ public final class PropertiesWithComments {
                     if (what.contains("=")) {
                         addCommentedProperty(s, true);
                     } else {
-                        contents.add(what);
+                        contents.add(s);
                     }
+                } else if (what.startsWith("--") || !what.contains("=")) {                    
+                    contents.add(s);
                 } else {
-    
                     addCommentedProperty(s, false);
                 }
                 s = reader.readLine();

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list