branch develop-3.x updated (bc4610d -> bc7ca65)
This is an automated email from the git hooks/post-receive script. New change to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git discards bc4610d fix NPe sur une caracteristique de type qualitative (refs #7023) new bc7ca65 fix NPe sur une caracteristique de type qualitative (fixes #7023) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (bc4610d) \ N -- N -- N refs/heads/develop-3.x (bc7ca65) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit bc7ca656225c9bff7f833cf5debff420470d8611 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 28 16:19:29 2015 +0200 fix NPe sur une caracteristique de type qualitative (fixes #7023) Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git commit bc7ca656225c9bff7f833cf5debff420470d8611 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 28 16:19:29 2015 +0200 fix NPe sur une caracteristique de type qualitative (fixes #7023) --- .../persistence/service/FishingOperationPersistenceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java index 479e8b6..2ad25f1 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java @@ -687,7 +687,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS value = alphanumericalValue; } else if (environmentCaracteristic.getCaracteristicType() == CaracteristicType.QUALITATIVE) { for (CaracteristicQualitativeValue qv : environmentCaracteristic.getQualitativeValue()) { - if (qualitativeValueId == Integer.parseInt(qv.getId())) { + if (Objects.equals(qualitativeValueId ,Integer.parseInt(qv.getId()))) { value = qv; break; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm