[java-identity-provider] branch main updated: IDP-2143 - JVM fork error when invoking plugin.sh

Scott Cantor cantor.2 at osu.edu
Wed Aug 23 19:06:38 UTC 2023


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

scantor 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=c613f8659e6f01b5cb2cfe64d89092b7fd9f3a53

The following commit(s) were added to refs/heads/main by this push:
     new c613f8659 IDP-2143 - JVM fork error when invoking plugin.sh
c613f8659 is described below

commit c613f8659e6f01b5cb2cfe64d89092b7fd9f3a53
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Aug 23 15:06:34 2023 -0400

    IDP-2143 - JVM fork error when invoking plugin.sh
    
    https://shibboleth.atlassian.net/browse/IDP-2143
    
    Added a second SHIB_OPTS variable that is applied after the arguments.
---
 .../src/main/resources/net/shibboleth/idp/module/bin/runclass.bat       | 2 +-
 .../src/main/resources/net/shibboleth/idp/module/bin/runclass.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/bin/runclass.bat b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/bin/runclass.bat
index d867e540c..8c2b6f570 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/bin/runclass.bat
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/bin/runclass.bat
@@ -31,4 +31,4 @@ set LOCALCLASSPATH=%~dp0lib\*;%WEBAPPCP%;%~dp0..\dist\webapp\WEB-INF\lib\*;%~dp0
 
 REM Go to it !
 
-%JAVACMD% -cp "%LOCALCLASSPATH%" %JAVA_OPTS% -Dnet.shibboleth.idp.cli.baseURL=%IDP_BASE_URL% %*
+%JAVACMD% -cp "%LOCALCLASSPATH%" %JAVA_OPTS% -Dnet.shibboleth.idp.cli.baseURL=%IDP_BASE_URL% %* %SHIB_OPTS%
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/bin/runclass.sh b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/bin/runclass.sh
index d669c9c51..807fbc372 100755
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/bin/runclass.sh
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/bin/runclass.sh
@@ -54,4 +54,4 @@ if [ -n "$JAVA_HOME" ] ; then
   fi
 fi
 
-"$JAVACMD" '-classpath' "$LOCALCLASSPATH" $JAVA_OPTS -Dnet.shibboleth.idp.cli.baseURL=$IDP_BASE_URL "$@"
\ No newline at end of file
+"$JAVACMD" '-classpath' "$LOCALCLASSPATH" $JAVA_OPTS -Dnet.shibboleth.idp.cli.baseURL=$IDP_BASE_URL "$@" $SHIB_OPTS
\ 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