Collaboration group bug fix and modified the caNanolab_deploy cli script

to ensure clean deploy
CBIIT · May 29, 2015 · 0467028 · 0467028
1 parent a1461c3
commit 0467028
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/software/cananolab-webapp/caNanoLab_deploy.cli b/software/cananolab-webapp/caNanoLab_deploy.cli
@@ -7,6 +7,11 @@ connect localhost:19990
 #              Deploy War Files                            
 ##############################################################
 
+if (outcome ==success) of /deployment=caNanoLab.war:read-resource
+undeploy caNanoLab.war
+end-if
+if (outcome ==success) of /deployment=uptEAR.ear:read-resource
+undeploy uptEAR.ear
+end-if
 deploy --force /local/content/caNanoLab/artifacts/caNanoLab.war
-deploy --force /local/content/caNanoLab/artifacts/uptEAR.ear
-
+deploy --force /local/content/caNanoLab/artifacts/uptEAR.ear
diff --git a/software/cananolab-webapp/src/gov/nih/nci/cananolab/dto/common/CollaborationGroupBean.java b/software/cananolab-webapp/src/gov/nih/nci/cananolab/dto/common/CollaborationGroupBean.java
@@ -60,7 +60,9 @@ public void setDescription(String description) {
 	public void addUserAccess(AccessibilityBean userAccess) {
 
 		for(int i = 0 ; i < this.getUserAccesses().size() ; i++){
-			if(this.getUserAccesses().get(i).getUserBean().getUserId().equals(userAccess.getUserBean().getUserId())){
+			if((userAccess.getUserBean().getUserId()!=null)&&(this.getUserAccesses().get(i).getUserBean().getUserId().equals(userAccess.getUserBean().getUserId()))){
+				this.getUserAccesses().remove(i);
+			}else if(this.getUserAccesses().get(i).getUserBean().getDisplayName().equalsIgnoreCase(userAccess.getUserBean().getDisplayName())){
 				this.getUserAccesses().remove(i);
 			}
 		}