Commit bb4bc0ae authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

Merge branch 'develop' into tmf-674-feature

parents e02c3856 f7c7cb8e

src/main/java/org/etsi/osl/tmf/sim638/model/Service.java

+5 −5
Original line number Diff line number Diff line
@@ -840,15 +840,15 @@ public class Service extends BaseRootNamedEntity { 
          

       

          if ( allActive ) {

            return ServiceStateType.ACTIVE ; 

            nextState = ServiceStateType.ACTIVE ; 

          } else if ( allTerminated ) {

            return ServiceStateType.TERMINATED ; 

            nextState = ServiceStateType.TERMINATED ; 

          } else if ( existsInactive ) {

            return ServiceStateType.INACTIVE ; 

            nextState = ServiceStateType.INACTIVE ; 

          } else if ( existsReserved ) {

            return ServiceStateType.RESERVED ; 

            nextState = ServiceStateType.RESERVED ; 

          } else if ( existsTerminated ) {

            return ServiceStateType.INACTIVE ; 

            nextState = ServiceStateType.INACTIVE ; 

          }

	  

      }