Skip properties whose key is null or assume an empty string value when the...

Skip properties whose key is null or assume an empty string value when the property value is null. JM-357


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1741 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/group/Group.java

@@ -420,7 +420,18 @@ public class Group implements Cacheable {
             pstmt.setString(1, name);
             ResultSet rs = pstmt.executeQuery();
             while (rs.next()) {
-                properties.put(rs.getString(1), rs.getString(2));
+                String key = rs.getString(1);
+                String value = rs.getString(2);
+                if (key != null) {
+                    if (value == null) {
+                        value = "";
+                        Log.warn("There is a group property whose value is null of Group: " + name);
+                    }
+                    properties.put(key, value);
+                }
+                else {
+                    Log.warn("There is a group property whose key is null of Group: " + name);
+                }
             }
             rs.close();
         }