OF-788 only set group properties on newly created groups

src/plugins/userservice/changelog.html

@@ -44,6 +44,12 @@
 User Service Plugin Changelog
 </h1>
 
+<p><b>1.4.3</b> -- May 5th, 2014</p>
+<ul>
+    <li>Fixed OF-0788: Only set group properties on newly created group</li>
+</ul>
+
+
 <p><b>1.4.2</b> -- December 15th, 2013</p>
 <ul>
     <li>Fixed OF-0719: Remove all roster items as well when deleting a user</li>

src/plugins/userservice/plugin.xml

@@ -5,8 +5,8 @@
     <name>User Service</name>
     <description>Allows administration of users via HTTP requests.</description>
     <author>Justin Hunt</author>
-    <version>1.4.2</version>
-    <date>09/13/2013</date>
+    <version>1.4.3</version>
+    <date>05/05/2014</date>
     <minServerVersion>3.9.0</minServerVersion>
     
     <adminconsole>		

src/plugins/userservice/src/java/org/jivesoftware/openfire/plugin/UserServicePlugin.java

@@ -107,16 +107,14 @@ public class UserServicePlugin implements Plugin, PropertyEventListener {
 				Group group = null;
 
                 try {
-                    GroupManager.getInstance().getGroup(groupName);
+                    group = GroupManager.getInstance().getGroup(groupName);
                 } catch (GroupNotFoundException e) {
                     // Create this group                    ;
-					GroupManager.getInstance().createGroup(groupName);
+					group = GroupManager.getInstance().createGroup(groupName);
+					group.getProperties().put("sharedRoster.showInRoster", "onlyGroup");
+					group.getProperties().put("sharedRoster.displayName", groupName);
+					group.getProperties().put("sharedRoster.groupList", "");
                 }
-				group = GroupManager.getInstance().getGroup(groupName);
-				group.getProperties().put("sharedRoster.showInRoster", "onlyGroup");
-				group.getProperties().put("sharedRoster.displayName", groupName);
-				group.getProperties().put("sharedRoster.groupList", "");
-
                 groups.add(group);
             }
             for (Group group : groups) {