summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Ward <chris@chrisgward.com>2012-12-20 15:45:09 +1100
committerChris Ward <chris@chrisgward.com>2012-12-20 15:45:09 +1100
commitd01d6bcd1bafc789512c58ca24795cb61a031d28 (patch)
treef38e17f5ba61b37ae86c743c1e4968e1ed950326
parent79a44b919cc05e1f03088d4345fc73363d9c490b (diff)
downloadEssentials-d01d6bcd1bafc789512c58ca24795cb61a031d28.tar
Essentials-d01d6bcd1bafc789512c58ca24795cb61a031d28.tar.gz
Essentials-d01d6bcd1bafc789512c58ca24795cb61a031d28.tar.lz
Essentials-d01d6bcd1bafc789512c58ca24795cb61a031d28.tar.xz
Essentials-d01d6bcd1bafc789512c58ca24795cb61a031d28.zip
Fix NPE in update (sorry again :P)
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
index d4f5c92b6..fb60d5b7c 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
@@ -801,7 +801,12 @@ public class EssentialsUpgrade
{
EssentialsConf config = new EssentialsConf(file);
config.load();
- Set<String> homes = config.getConfigurationSection("homes").getKeys(true);
+ ConfigurationSection homesSection = config.getConfigurationSection("homes");
+ if(homesSection == null)
+ {
+ continue;
+ }
+ Set<String> homes = homesSection.getKeys(true);
for(String s : homes)
{
if(!s.contains(".") && Util.isInt(s))