PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#1938: Better handling of null config keys

Browse Source
This commit is contained in:
md_5 2016-08-18 09:35:58 +10:00
parent 37b3cb4a30
commit 11c7b246e0
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/src/main/java/net/md_5/bungee/config/Configuration.java
View File

@ -32,7 +32,7 @@ public final class Configuration
for ( Map.Entry<?, ?> entry : map.entrySet() ) for ( Map.Entry<?, ?> entry : map.entrySet() )
{ {
String key = entry.getKey().toString(); String key = ( entry.getKey() == null ) ? "null" : entry.getKey().toString();
if ( entry.getValue() instanceof Map ) if ( entry.getValue() instanceof Map )
{ {

16
config/src/test/java/net/md_5/bungee/config/YamlConfigurationTest.java
View File

@ -49,6 +49,10 @@ public class YamlConfigurationTest
+ " 2: 2\n" + " 2: 2\n"
+ " 3: 3\n" + " 3: 3\n"
+ " 4: 4"; + " 4: 4";
private static final String NULL_TEST = ""
+ "null:\n"
+ " null: object\n"
+ " object: null\n";
@Test @Test
public void testConfig() throws Exception public void testConfig() throws Exception
@ -103,4 +107,16 @@ public class YamlConfigurationTest
// empty // empty
} }
} }
@Test
public void testNull()
{
Configuration conf = ConfigurationProvider.getProvider( YamlConfiguration.class ).load( NULL_TEST );
Assert.assertEquals( "object", conf.get( "null.null" ) );
Assert.assertEquals( "object", conf.getSection( "null" ).get( "null" ) );
Assert.assertEquals( null, conf.get( "null.object" ) );
Assert.assertEquals( "", conf.getString( "null.object" ) );
}
} }