oxTrust issue #384

GluuFederation · Nov 7, 2016 · 6c16f20 · 6c16f20
1 parent 4e454ca
commit 6c16f20
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/server/src/main/java/org/gluu/oxtrust/action/UpdateTrustRelationshipAction.java b/server/src/main/java/org/gluu/oxtrust/action/UpdateTrustRelationshipAction.java
@@ -258,6 +258,7 @@ public String save() {
 				this.trustRelationship.setInum(this.inum);
 			} else {
 				this.inum = this.trustRelationship.getInum();
+				update=true;
 			}
 
 			boolean updateShib2Configuration = applicationConfiguration.isConfigGeneration();
@@ -279,7 +280,9 @@ public String save() {
 					update = true;
 					updateSpMetaDataCert(certWrapper);
 //					setEntityId();
-					this.trustRelationship.setStatus(GluuStatus.ACTIVE);
+					if(!update){
+						this.trustRelationship.setStatus(GluuStatus.ACTIVE);
+					}
 				} else {
 					log.error("Failed to save SP meta-data file {0}", fileWrapper);
 					return OxTrustConstants.RESULT_FAILURE;
@@ -296,7 +299,9 @@ public String save() {
 					}else{
 						log.info("There is no resource found Uri : {0}", trustRelationship.getSpMetaDataURL());
 					}
-					this.trustRelationship.setStatus(GluuStatus.ACTIVE);
+					if(!update){
+						this.trustRelationship.setStatus(GluuStatus.ACTIVE);
+					}
 					/*} else {
 						log.error("Failed to save SP meta-data file {0}", fileWrapper);
 						return OxTrustConstants.RESULT_FAILURE;
@@ -306,7 +311,9 @@ public String save() {
 				}
 				break;
 			case FEDERATION:
-				this.trustRelationship.setStatus(GluuStatus.ACTIVE);
+				if(!update){
+					this.trustRelationship.setStatus(GluuStatus.ACTIVE);
+				}
 				if (this.trustRelationship.getEntityId() == null) {
 					return "invalid_entity_id";
 				}