Commit 5f5c8274 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'issue_16' into 'develop' 

MR: issue_16 branch to develop

See merge request !16
parents 1cda860f ac279854

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

+1 −1
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ public class Service extends BaseRootNamedEntity { 
      if ( ckind != null && ckind.getValue() != null) {

        resourceKind = ckind.getValue().getValue() ; //example "Application"

      }

      if (serviceKindChar.getValue().getValue().equals( resourceKind )) { //if this service is the same kind as the resource then don't prefix the characteristic

      if (serviceKindChar.getValue().getValue().equals( resourceKind ) || this.getCategory().equals(resourceKind) ) { //if this service is the same kind as the resource then don't prefix the characteristic

        return true;

      } 

    }