This is an automated email from the git hooks/post-receive script. New commit to branch feature/7133 in repository observe. See http://git.codelutin.com/observe.git commit 2fed57397e64c2a9437334acfeb249bbfcd5c6d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 16:14:51 2015 +0200 correction de l'égalité sur référence + inversion des equals (refs #7133 refs #7132) --- .../java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java | 4 ++-- .../src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java index d9fe3d8..c78ee0c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java @@ -171,9 +171,9 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO String vesselActivityId = resultSet.getString(4); if (vesselActivityId == null) { activity.setType(TripMapPointType.LONGLINE_ACTIVITY); - } else if (vesselActivityId.equals(ACTIVITY_INTERACTION_ID)) { + } else if (ACTIVITY_INTERACTION_ID.equals(vesselActivityId)) { activity.setType(TripMapPointType.LONGLINE_ACTIVITY_WITH_INTERACTION); - } else if (vesselActivityId.equals(ACTIVITY_STATION_ID)) { + } else if (ACTIVITY_STATION_ID.equals(vesselActivityId)) { activity.setType(TripMapPointType.LONGLINE_ACTIVITY_WITH_STATION); } else { activity.setType(TripMapPointType.LONGLINE_ACTIVITY); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java index 51f623a..685d261 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java @@ -154,7 +154,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< point.setTime(time); point.setLatitude(resultSet.getFloat(3)); point.setLongitude(resultSet.getFloat(4)); - if (resultSet.getString(5) == ACTIVITY_HARBOUR_ID) { + if (ACTIVITY_HARBOUR_ID.equals(resultSet.getString(5))) { point.setType(TripMapPointType.SEINE_ACTIVITY_IN_HARBOUR); } else if (resultSet.getString(6) == null) { point.setType(TripMapPointType.SEINE_ACTIVITY); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.