Commits
Nothixal authored and md_5 committed 907b7a0e921
| 989 989 | pb.environment().put( "JAVA_HOME", System.getProperty( "java.home" ) ); |
| 990 990 | pb.environment().put( "GIT_COMMITTER_NAME", "BuildTools" ); |
| 991 991 | pb.environment().put( "GIT_COMMITTER_EMAIL", "unconfigured@null.spigotmc.org" ); |
| 992 992 | pb.environment().remove( "M2_HOME" ); // Just let maven figure this out from where it is invoked |
| 993 993 | if ( !pb.environment().containsKey( "MAVEN_OPTS" ) ) |
| 994 994 | { |
| 995 995 | pb.environment().put( "MAVEN_OPTS", "-Xmx1024M" ); |
| 996 996 | } |
| 997 997 | if ( !pb.environment().containsKey( "_JAVA_OPTIONS" ) ) |
| 998 998 | { |
| 999 - | String javaOptions = "-Djdk.net.URLClassPath.disableClassPathURLCheck=true"; |
| 999 + | String javaOptions = null; |
| 1000 1000 | |
| 1001 1001 | for ( String arg : ManagementFactory.getRuntimeMXBean().getInputArguments() ) |
| 1002 1002 | { |
| 1003 1003 | if ( arg.startsWith( "-Xmx" ) ) |
| 1004 1004 | { |
| 1005 - | javaOptions += " " + arg; |
| 1005 + | javaOptions = arg; |
| 1006 + | break; |
| 1006 1007 | } |
| 1007 1008 | } |
| 1008 1009 | |
| 1009 - | pb.environment().put( "_JAVA_OPTIONS", javaOptions ); |
| 1010 + | if ( javaOptions != null ) |
| 1011 + | { |
| 1012 + | pb.environment().put( "_JAVA_OPTIONS", javaOptions ); |
| 1013 + | } |
| 1010 1014 | } |
| 1011 1015 | if ( IS_WINDOWS ) |
| 1012 1016 | { |
| 1013 1017 | String pathEnv = null; |
| 1014 1018 | for ( String key : pb.environment().keySet() ) |
| 1015 1019 | { |
| 1016 1020 | if ( key.equalsIgnoreCase( "path" ) ) |
| 1017 1021 | { |
| 1018 1022 | pathEnv = key; |
| 1019 1023 | } |