Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

no need to report memory/stack as properties #294

Merged
merged 1 commit into from

2 participants

@kares
Collaborator

as they are resolved from RuntimeMXBean (see 5d86783)

@kares kares no need to report memory/stack as properties
as they are resolved from RuntimeMXBean (see 5d86783)
d9b569f
@headius
Owner

Oh, good catch!

@headius headius merged commit 198f078 into jruby:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 9, 2012
  1. @kares

    no need to report memory/stack as properties

    kares authored
    as they are resolved from RuntimeMXBean (see 5d86783)
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 4 deletions.
  1. +1 −4 bin/jruby.sh
View
5 bin/jruby.sh
@@ -248,16 +248,13 @@ if [[ -z "$JAVA_ENCODING" ]]; then
java_args="${java_args} -Dfile.encoding=UTF-8"
fi
-# Add a property to report memory max
-JAVA_OPTS="$JAVA_OPTS $JAVA_VM -Djruby.memory.max=${JAVA_MEM} -Djruby.stack.max=${JAVA_STACK}"
-
# Append the rest of the arguments
ruby_args="${ruby_args} $@"
# Put the ruby_args back into the position arguments $1, $2 etc
set -- "${ruby_args}"
-JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK"
+JAVA_OPTS="$JAVA_OPTS $JAVA_VM $JAVA_MEM $JAVA_STACK"
JFFI_BOOT=""
if [ -d "$JRUBY_HOME/lib/native/" ]; then
Something went wrong with that request. Please try again.