Merge branch 'issue-1021' into 'develop'

Fixed issue #1021: regression in EventEnablingPredicateFilter Closes #1021 See merge request !340

Merge branch 'issue-1021' into 'develop'
Fixed issue #1021: regression in EventEnablingPredicateFilter Closes #1021 See merge request !340
c75c417c · Pascal Parraud · b73c4ae7 · 1a32bb2d · c75c417c · c75c417c
Commit c75c417c authored Jan 20, 2023 by Pascal Parraud
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,6 +21,9 @@
  </properties>
  <body>
    <release version="12.0" date="TBD" description="TBD">
+      <action dev="pascal" type="fix" issue="1021">
+        Fixed regression introduced in EventEnablingPredicateFilter when fixing issue 1017.
+      </action>
      <action dev="luc" type="fix" issue="1020">
        Fixed regression introduced in ImpulseManeuver when fixing issue 1017.
      </action>

--- a/src/main/java/org/orekit/propagation/events/EventEnablingPredicateFilter.java
+++ b/src/main/java/org/orekit/propagation/events/EventEnablingPredicateFilter.java
@@ -291,14 +291,14 @@ public class EventEnablingPredicateFilter
        public Action eventOccurred(final SpacecraftState s, final EventDetector detector, final boolean increasing) {
            final EventEnablingPredicateFilter ef = (EventEnablingPredicateFilter) detector;
            final Transformer transformer = ef.forward ? ef.transformers[ef.transformers.length - 1] : ef.transformers[0];
-            return ef.rawDetector.getHandler().eventOccurred(s, ef, transformer == Transformer.PLUS ? increasing : !increasing);
+            return ef.rawDetector.getHandler().eventOccurred(s, ef.rawDetector, transformer == Transformer.PLUS ? increasing : !increasing);
        }

        /** {@inheritDoc} */
        @Override
        public SpacecraftState resetState(final EventDetector detector, final SpacecraftState oldState) {
            final EventEnablingPredicateFilter ef = (EventEnablingPredicateFilter) detector;
-            return ef.rawDetector.getHandler().resetState(ef, oldState);
+            return ef.rawDetector.getHandler().resetState(ef.rawDetector, oldState);
        }

    }