Permgen does not exist on Java 8+. [skip ci]

jruby · Mar 1, 2018 · 6c9e1ff · 6c9e1ff
1 parent a42ef32
commit 6c9e1ff
Showing 4 changed files with 3 additions and 17 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -22,7 +22,6 @@
 
               'jruby.basedir' => '${basedir}/..',
               'jruby.test.memory' => '3G',
-              'jruby.test.memory.permgen' => '2G',
               'jruby.compile.memory' => '2G',
 
               'create.sources.jar' => false )
@@ -226,7 +225,7 @@
           'systemProperties' => {
             'jruby.home' =>  '${basedir}/..'
           },
-          'argLine' =>  '-Xmx${jruby.test.memory} -XX:MaxPermSize=${jruby.test.memory.permgen} -Dfile.encoding=UTF-8 -Djava.awt.headless=true',
+          'argLine' =>  '-Xmx${jruby.test.memory} -Dfile.encoding=UTF-8 -Djava.awt.headless=true',
           'includes' => [ 'org/jruby/test/MainTestSuite.java',
                           'org/jruby/embed/**/*Test*.java',
                           'org/jruby/util/**/*Test*.java',

diff --git a/core/pom.xml b/core/pom.xml
@@ -24,7 +24,6 @@ DO NOT MODIFIY - GENERATED CODE
     <pkg.dir>${build.dir}/pkg</pkg.dir>
     <spec.dir>spec</spec.dir>
     <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
-    <jruby.test.memory.permgen>2G</jruby.test.memory.permgen>
     <installer.gems>${jruby.win32ole.gem}</installer.gems>
     <prawn.git.repo>git://github.com/sandal/prawn.git</prawn.git.repo>
     <version.ruby.minor>1</version.ruby.minor>
@@ -585,7 +584,7 @@ DO NOT MODIFIY - GENERATED CODE
           <systemProperties>
             <jruby.home>${basedir}/..</jruby.home>
           </systemProperties>
-          <argLine>-Xmx${jruby.test.memory} -XX:MaxPermSize=${jruby.test.memory.permgen} -Dfile.encoding=UTF-8 -Djava.awt.headless=true</argLine>
+          <argLine>-Xmx${jruby.test.memory} -Dfile.encoding=UTF-8 -Djava.awt.headless=true</argLine>
           <includes>
             <include>org/jruby/test/MainTestSuite.java</include>
             <include>org/jruby/embed/**/*Test*.java</include>

diff --git a/core/src/main/java/org/jruby/Main.java b/core/src/main/java/org/jruby/Main.java
@@ -354,11 +354,7 @@ private Status handleOutOfMemory(OutOfMemoryError ex) {
         boolean heapError = false;
 
         if (oomeMessage != null) {
-            if (oomeMessage.contains("PermGen")) {
-                // report permgen memory error
-                config.getError().println("Error: Your application exhausted PermGen area of the heap.");
-                config.getError().println("Specify -J-XX:MaxPermSize=###M to increase it (### = PermGen size in MB).");
-            } else if (oomeMessage.contains("unable to create new native thread")) {
+            if (oomeMessage.contains("unable to create new native thread")) {
                 // report thread exhaustion error
                 config.getError().println("Error: Your application demanded too many live threads, perhaps for Fiber or Enumerator.");
                 config.getError().println("Ensure your old Fibers and Enumerators are being cleaned up.");

diff --git a/maven/jruby/README.md b/maven/jruby/README.md
@@ -1,13 +1,5 @@
 # running tests #
 
-important for the rails4 warfile tests to increase the PermGen Space
-for jdk7
-
-```
-export MAVEN_OPTS='-XX:MaxPermSize=512m'
-```
-
-
 all tests from the ./maven/jruby directory
 ```
 mvn verify -Papps