#42: Create software release 1.2.0. Improved logging messages to diag…

…nose cause of Travis build failure.
channelaccess · Jul 26, 2018 · c589ce2 · c589ce2
1 parent e59ba43
commit c589ce2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/...g/epics/ca/impl/monitor/blockingqueue/BlockingQueueMonitorNotificationServiceFactory.java b/...g/epics/ca/impl/monitor/blockingqueue/BlockingQueueMonitorNotificationServiceFactory.java
@@ -84,13 +84,13 @@ public <T> MonitorNotificationService<T> getServiceForConsumer( Consumer<? super
    @Override
    public void close()
    {
+      logger.log(Level.INFO, String.format( "A BlockingQueueMonitorNotificationServiceFactory is being closed with %d service entries...", getServiceCount() ) );
       for ( MonitorNotificationService service : serviceList )
       {
          service.close();
       }
       serviceList.clear();
       MonitorNotificationServiceFactoryCreator.shutdownExecutor( threadPoolExecutor );
-      logger.log(Level.INFO, String.format( "A BlockingQueueMonitorNotificationServiceFactory has been closed with %d service entries.", getServiceCount() ) );
    }
 
    /**

diff --git a/.../java/org/epics/ca/impl/monitor/disruptor/DisruptorMonitorNotificationServiceFactory.java b/.../java/org/epics/ca/impl/monitor/disruptor/DisruptorMonitorNotificationServiceFactory.java
@@ -80,12 +80,12 @@ public <T> MonitorNotificationService<T> getServiceForConsumer( Consumer<? super
    @Override
    public void close()
    {
+      logger.log(Level.INFO, String.format( "A DisruptorMonitorNotificationServiceFactory is being closed with %d service entries...", getServiceCount() ) );
       for ( MonitorNotificationService service : serviceList )
       {
          service.close();
       }
       serviceList.clear();
-      logger.log(Level.INFO, String.format( "A DisruptorMonitorNotificationServiceFactory has been closed with %d service entries.", getServiceCount() ) );
    }
 
    /**

diff --git a/...pics/ca/impl/monitor/striped/StripedExecutorServiceMonitorNotificationServiceFactory.java b/...pics/ca/impl/monitor/striped/StripedExecutorServiceMonitorNotificationServiceFactory.java
@@ -76,13 +76,13 @@ public <T> MonitorNotificationService<T> getServiceForConsumer( Consumer<? super
    @Override
    public void close()
    {
+      logger.log(Level.INFO, String.format( "A StripedExecutorServiceMonitorNotificationServiceFactory is being closed with %d service entries...", getServiceCount() ) );
       for ( MonitorNotificationService service : serviceList )
       {
          service.close();
       }
       serviceList.clear();
       MonitorNotificationServiceFactoryCreator.shutdownExecutor( stripedExecutorService );
-      logger.log(Level.INFO, String.format( "A StripedExecutorServiceMonitorNotificationServiceFactory has been closed with %d service entries.", getServiceCount() ) );
    }
 
    /**

diff --git a/src/test/java/org/epics/ca/ChannelThroughputTests.java b/src/test/java/org/epics/ca/ChannelThroughputTests.java
@@ -134,9 +134,9 @@ void TestPutAndMonitor( String serviceImpl, int numberOfPuts )
       final Properties contextProperties = new Properties();
       contextProperties.setProperty( "CA_MONITOR_NOTIFIER_IMPL", serviceImpl );
 
-      try ( final Context mySpecialContext = new Context( contextProperties ) )
+      try ( final Context context = new Context( contextProperties ) )
       {
-         final Channel<Integer> channel = mySpecialContext.createChannel("adc01", Integer.class);
+         final Channel<Integer> channel = context.createChannel("adc01", Integer.class);
          channel.connect();
 
          // Add a value monitor and wait for first notification of the initial value
@@ -193,9 +193,9 @@ void TestFastCounterMonitor( String serviceImpl, int numberOfNotifications )
       final Properties contextProperties = new Properties();
       contextProperties.setProperty( "CA_MONITOR_NOTIFIER_IMPL", serviceImpl );
 
-      try ( final Context mySpecialContext = new Context( contextProperties ) )
+      try ( final Context context = new Context( contextProperties ) )
       {
-         final Channel<Integer> channel = mySpecialContext.createChannel("fastCounter", Integer.class );
+         final Channel<Integer> channel = context.createChannel("fastCounter", Integer.class );
          channel.connect();
          final List<Monitor> monitorList = new ArrayList<>();