Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java @ 2111:85d31c2620e5
Avoid an unlikely NPE.
flys-artifacts/trunk@3674 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 13 Jan 2012 11:40:27 +0000 |
| parents | 8cb679d4ec49 |
| children | bf67eb014443 |
comparison
equal
deleted
inserted
replaced
| 2110:7c5bcb0e03e1 | 2111:85d31c2620e5 |
|---|---|
| 183 return new ArrayList<String>(previousStateIds); | 183 return new ArrayList<String>(previousStateIds); |
| 184 } | 184 } |
| 185 | 185 |
| 186 /** | 186 /** |
| 187 * Copies data item from other artifact to this artifact. | 187 * Copies data item from other artifact to this artifact. |
| 188 * | |
| 188 * @param other Artifact from which to get data. | 189 * @param other Artifact from which to get data. |
| 189 * @param name Name of data. | 190 * @param name Name of data. |
| 190 */ | 191 */ |
| 191 protected void importData(FLYSArtifact other, final String name) { | 192 protected void importData(FLYSArtifact other, final String name) { |
| 192 if (other == null) { | 193 if (other == null) { |
| 193 logger.error("No other art. to import data " + name + " from."); | 194 logger.error("No other art. to import data " + name + " from."); |
| 195 return; | |
| 194 } | 196 } |
| 195 | 197 |
| 196 StateData sd = other.getData(name); | 198 StateData sd = other.getData(name); |
| 197 | 199 |
| 198 if (sd == null) { | 200 if (sd == null) { |