Project

General

Profile

« Previous | Next » 

Revision aaee4922

Added by Andreas Müller about 5 years ago

ref #7283 fix NPE in AlternativeIdentifier constructor if no type is given

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/IdentifiedEntityDTO.java
32 32 
		String typeLabel;
33 33 
		String identifier;
34 34 
		public AlternativeIdentifier(DefinedTerm identifierType, String identifier) {
35 
			this.typeUuid = identifierType.getUuid();
36 
			this.typeLabel = identifierType.getTitleCache();
35 
			if (identifierType != null){
36 
			    this.typeUuid = identifierType.getUuid();
37 
			    this.typeLabel = identifierType.getTitleCache();
38 
			}
37 39 
			this.identifier = identifier;
38 40 
		}
39 41 
		public UUID getTypeUuid() {return typeUuid;}
......
49 51 
	    this.identifier = new AlternativeIdentifier(identifierType, identifier);
50 52 
	}
51 53 

  		




  52
  
  
    
	public IdentifiedEntityDTO(DefinedTerm identifierType, String identifier, UUID entityUuid, String titleCache, String abbrevTitleCache){


  		




  
  54
  
    
	public IdentifiedEntityDTO(DefinedTerm identifierType, String identifier,


  		




  
  55
  
    
	        UUID entityUuid, String titleCache, String abbrevTitleCache){


  		




  53
  56
  
    
	    super(entityUuid, titleCache, abbrevTitleCache);


  		




  54
  57
  
    
	    this.identifier = new AlternativeIdentifier(identifierType, identifier);


  		




  55
  58
  
    
	}


  		












Also available in:  Unified diff