Revision 346eb1a6
Added by Andreas Müller almost 2 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java | ||
---|---|---|
346 | 346 |
@Override |
347 | 347 |
//@Transient //TODO a.kohlbecker remove?? |
348 | 348 |
public String getTitleCache() { |
349 |
isGeneratingTitleCache = true; |
|
350 | 349 |
String result = ""; |
351 | 350 |
if (isProtectedTitleCache()){ |
352 | 351 |
result = this.titleCache; |
... | ... | |
356 | 355 |
result = getTruncatedCache(result); |
357 | 356 |
this.titleCache = result; |
358 | 357 |
} |
359 |
isGeneratingTitleCache = false; |
|
360 | 358 |
return result; |
361 | 359 |
} |
362 | 360 |
|
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java | ||
---|---|---|
14 | 14 |
import javax.xml.bind.annotation.XmlAccessType; |
15 | 15 |
import javax.xml.bind.annotation.XmlAccessorType; |
16 | 16 |
import javax.xml.bind.annotation.XmlElement; |
17 |
import javax.xml.bind.annotation.XmlTransient; |
|
18 | 17 |
import javax.xml.bind.annotation.XmlType; |
19 | 18 |
|
20 | 19 |
import org.apache.log4j.Logger; |
... | ... | |
64 | 63 |
// public String getOriginalNomenclaturalTitle() {return originalNomenclaturalTitle;} |
65 | 64 |
// public void setOriginalNomenclaturalTitle(String originalNomenclaturalTitle) {this.originalNomenclaturalTitle = originalNomenclaturalTitle;} |
66 | 65 |
|
67 |
@Transient |
|
68 |
@XmlTransient |
|
69 |
protected boolean isGeneratingTitleCache = false; //state variable to avoid recursions when generating title cache and nomenclatural title |
|
70 |
|
|
71 |
|
|
72 | 66 |
//#9664 |
73 | 67 |
@Override |
74 | 68 |
public String getNomenclaturalTitleCache() { |
... | ... | |
112 | 106 |
} |
113 | 107 |
} |
114 | 108 |
|
115 |
|
|
116 | 109 |
@Override |
117 | 110 |
@Transient |
118 | 111 |
/* |
... | ... | |
126 | 119 |
[a.kohlbecker May 2011] |
127 | 120 |
*/ |
128 | 121 |
public String getTitleCache() { |
129 |
isGeneratingTitleCache = true; |
|
130 | 122 |
String result = super.getTitleCache(); |
131 | 123 |
result = replaceEmptyTitleByNomTitle(result); |
132 |
isGeneratingTitleCache = false; |
|
133 | 124 |
return result; |
134 | 125 |
} |
135 | 126 |
|
Also available in: Unified diff
remove isGeneratingTitleCache which is not in use anymore