[activemq] branch master updated: no jira - fix unit test failure

[gtully]

This is an automated email from the ASF dual-hosted git repository.

gtully pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
     new d5df23b  no jira - fix unit test failure
d5df23b is described below

commit d5df23b8fb97cbd063a9eb63178da8b61f5d8bbe
Author: gtully <gary.tu...@gmail.com>
AuthorDate: Wed Mar 13 10:03:18 2019 +0000

    no jira - fix unit test failure
---
 .../activemq/broker/region/DestinationGCStressTest.java   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationGCStressTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationGCStressTest.java
index c23c65a..61c01d8 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationGCStressTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationGCStressTest.java
@@ -18,6 +18,7 @@ package org.apache.activemq.broker.region;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerStoppedException;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQTopic;
@@ -130,6 +131,7 @@ public class DestinationGCStressTest {
                             while ((j = max.decrementAndGet()) > 0) {
                                 producer.send(new ActiveMQTopic("A." + j), 
message);
                             }
+                            c.close();
                         } catch (Exception ignored) {
                             ignored.printStackTrace();
                         }
@@ -162,8 +164,13 @@ public class DestinationGCStressTest {
             @Override
             public void doAppend(LoggingEvent event) {
                 if (event.getLevel().equals(Level.ERROR) && 
event.getMessage().toString().startsWith("Failed to remove inactive")) {
-                    logger.info("received unexpected log message: " + 
event.getMessage());
-                    failed.set(true);
+                    if (event.getThrowableInformation().getThrowable() != null
+                            && 
event.getThrowableInformation().getThrowable().getCause() instanceof 
BrokerStoppedException) {
+                        // ok
+                    } else {
+                        logger.info("received unexpected log message: " + 
event.getMessage());
+                        failed.set(true);
+                    }
                 }
             }
         };
@@ -193,6 +200,7 @@ public class DestinationGCStressTest {
                             while ((j = max.decrementAndGet()) > 0) {
                                 producer.send(new ActiveMQTopic("A." + j), 
message);
                             }
+                            c.close();
                         } catch (Exception ignored) {
                             ignored.printStackTrace();
                         }
@@ -209,6 +217,7 @@ public class DestinationGCStressTest {
                             messageConsumer.close();
 
                         } catch (Exception ignored) {
+                            ignored.printStackTrace();
                         }
                     }
                 }
@@ -266,6 +275,7 @@ public class DestinationGCStressTest {
                         while ((j = max.decrementAndGet()) > 0) {
                             producer.send(new ActiveMQTopic("A." + j), 
message);
                         }
+                        c.close();
                     } catch (Exception ignored) {
                         ignored.printStackTrace();
                     }
@@ -285,6 +295,7 @@ public class DestinationGCStressTest {
                         messageConsumer.close();
 
                     } catch (Exception ignored) {
+                        ignored.printStackTrace();
                     }
                 }
             }