Merge pull request #108 from Dmck2b/PermGenLink

Add more information about changing PermGen size
This commit is contained in:
md-5 2014-01-28 16:04:00 -08:00
commit 1bf13129a5

View file

@ -1,14 +1,14 @@
From 79b1556a3f83cc53c8ef6260f5897495fa595225 Mon Sep 17 00:00:00 2001 From 8419a2d0a468dd909b42f8d81b415d2945765827 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 14:07:41 +1100 Date: Mon, 23 Dec 2013 14:07:41 +1100
Subject: [PATCH] Warn if PermGen may be insufficient Subject: [PATCH] Warn if PermGen may be insufficient
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 07c26f1..7e7b1ec 100644 index 07c26f1..246e641 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -149,6 +149,21 @@ public class Main { @@ -149,6 +149,22 @@ public class Main {
useConsole = false; useConsole = false;
} }
@ -25,6 +25,7 @@ index 07c26f1..7e7b1ec 100644
+ if ( maxPermGen < (128<<10) ) // 128mb + if ( maxPermGen < (128<<10) ) // 128mb
+ { + {
+ System.out.println( "Warning, your max perm gen size is not set or less than 128mb. It is recommended you restart Java with the following argument: -XX:MaxPermSize=128M" ); + System.out.println( "Warning, your max perm gen size is not set or less than 128mb. It is recommended you restart Java with the following argument: -XX:MaxPermSize=128M" );
+ System.out.println( "Please see http://www.spigotmc.org/wiki/changing-permgen-size/ for more details and more in-depth instructions." );
+ } + }
+ // Spigot End + // Spigot End
System.out.println("Loading libraries, please wait..."); System.out.println("Loading libraries, please wait...");