[gatein-commits] gatein SVN: r3264 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.

[do-not-reply at jboss.org]

Author: thanh_tung_do
Date: 2010-06-09 00:13:18 -0400 (Wed, 09 Jun 2010)
New Revision: 3264

Modified:
   portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java
Log:
GTNPORTAL-1218: don't  link membership if membership type is null

Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java	2010-06-09 04:09:26 UTC (rev 3263)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java	2010-06-09 04:13:18 UTC (rev 3264)
@@ -188,8 +188,11 @@
          User user = service.getUserHandler().findUserByName(username);
          MembershipType membershipType =
             service.getMembershipTypeHandler().findMembershipType(GroupManagement.getUserACL().getAdminMSType());
-         service.getMembershipHandler().linkMembership(user, newGroup, membershipType, true);
-
+         
+         if(membershipType !=null){
+            service.getMembershipHandler().linkMembership(user, newGroup, membershipType, true);
+         }
+         
          uiGroupExplorer.changeGroup(changeGroupId);
          uiGroupForm.reset();
          uiGroupForm.setGroup(null);