@@ -140,12 +140,6 @@ public boolean closeRelayServiceProvider(String relay) throws Exception {
140140 public boolean subscribeForActivityEventsFrom (String relay ) throws Exception {
141141 logMessage (loggingClassName + ":registerForEvents START" );
142142 EventStub evStub = LocalMALInstance .instance ().activityEventStub (relay , domain );
143- /*
144- EntityKeyList ekl = new EntityKeyList();
145- EntityRequestList erl = new EntityRequestList();
146- ekl.add(new EntityKey(ALL_ID, new Long(ALL_INT), new Long(ALL_INT), new Long(ALL_INT)));
147- erl.add(new EntityRequest(null, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.FALSE, ekl));
148- */
149143 SubscriptionFilterList filters = new SubscriptionFilterList ();
150144 Subscription sub = new Subscription (new Identifier ("SubA" ), domain , null , filters );
151145 evStub .monitorEventRegister (sub , monitorEventAdapter );
@@ -192,7 +186,6 @@ public boolean createActivityServiceRelayCalledToRelayTo(String relayName, Strin
192186 * Clears any existing activity reports.
193187 *
194188 * @return success indication - currently always true.
195- * @throws Exception generated in case of comms failures
196189 */
197190 public boolean clearReceivedActivityReportsList () {
198191 logMessage (loggingClassName + ":clearReceivedActivityReportsList" );
@@ -211,7 +204,8 @@ public boolean clearReceivedActivityReportsList() {
211204 * @param transactivity the transport phases
212205 * @param exeactivity the execution phases
213206 * @return monitorkey to be used to check result of the pattern.
214- * @throws Exception generated in case of comms failures
207+ * @throws org.ccsds.moims.mo.mal.MALException
208+ * @throws org.ccsds.moims.mo.mal.MALInteractionException
215209 */
216210 public String patternInitiationForViaWithTransportActivityAndExecutionActivity (String pattern ,
217211 String relay , String [] transactivity , String [] exeactivity ) throws MALException , MALInteractionException {
@@ -330,15 +324,6 @@ public boolean receivedExpectedTransportActivity(String monitorKey, String[] tra
330324 }
331325 }
332326 }
333- // for (int i = 0; i < transactivity.length; i++)
334- // {
335- // logMessage(loggingClassName + " EXP Trans " + transactivity[i]);
336- // }
337- //
338- // for (int i = 0; i < monitorEventAdapter.getMonitorEventList().size(); i++)
339- // {
340- // logMessage(loggingClassName + " RX " + monitorEventAdapter.getMonitorEventList().get(i));
341- // }
342327
343328 logMessage (loggingClassName + ":receivedExpectedTransportActivity RET = " + transEventsMatch );
344329 return transEventsMatch ;
0 commit comments