Fixes #487.

hazelcast · May 27, 2013 · 76c71f0 · 76c71f0
1 parent 44a27ec
commit 76c71f0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/hazelcast/src/main/java/com/hazelcast/config/ConfigXmlGenerator.java b/hazelcast/src/main/java/com/hazelcast/config/ConfigXmlGenerator.java
@@ -180,7 +180,7 @@ public String generate(Config config) {
         xml.append("</asymmetric-encryption>");
         xml.append("</network>");
         final PartitionGroupConfig pg = config.getPartitionGroupConfig();
-        if (pg != null) {
+        if (pg != null && pg.getGroupType() != null) {
             xml.append("<partition-group enabled=\"").append(pg.isEnabled())
                     .append("\" group-type=\"").append(pg.getGroupType()).append("\" />");
         }

diff --git a/hazelcast/src/test/java/com/hazelcast/config/XMLConfigBuilderTest.java b/hazelcast/src/test/java/com/hazelcast/config/XMLConfigBuilderTest.java
@@ -110,9 +110,18 @@ public void readSemaphoreConfig() {
     }
 
     @Test
-    public void testConfig2Xml2Config() {
-        final Config config = new ClasspathXmlConfig("hazelcast-fullconfig.xml");
-        final String xml = new ConfigXmlGenerator().generate(config);
+    public void testConfig2Xml2DefaultConfig() {
+        testConfig2Xml2Config("hazelcast-default.xml");
+    }
+
+    @Test
+    public void testConfig2Xml2FullConfig() {
+        testConfig2Xml2Config("hazelcast-fullconfig.xml");
+    }
+
+    private void testConfig2Xml2Config(String fileName) {
+        final Config config = new ClasspathXmlConfig(fileName);
+        final String xml = new ConfigXmlGenerator(true).generate(config);
         final Config config2 = new InMemoryXmlConfig(xml);
         assertTrue(config.isCompatible(config2));
         assertTrue(config2.isCompatible(config));