activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [3/3] activemq git commit: Fix compile failure after back ports/cherry-picks
Date Thu, 03 Dec 2015 18:39:09 GMT
Fix compile failure after back ports/cherry-picks


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/82e12f0e
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/82e12f0e
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/82e12f0e

Branch: refs/heads/activemq-5.12.x
Commit: 82e12f0e5f02d68766446bfb91bac021a4596389
Parents: 7eb9b21
Author: Daniel Kulp <dkulp@apache.org>
Authored: Wed Oct 28 11:00:41 2015 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Dec 3 19:38:28 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/activemq/transport/stomp/StompTestSupport.java | 2 +-
 .../apache/activemq/transport/failover/FailoverTimeoutTest.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/82e12f0e/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTestSupport.java
----------------------------------------------------------------------
diff --git a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTestSupport.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTestSupport.java
index a8d4884..bdc599a 100644
--- a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTestSupport.java
+++ b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTestSupport.java
@@ -111,7 +111,7 @@ public class StompTestSupport {
     }
 
     public void startBroker() throws Exception {
-        createBroker();
+        createBroker(true);
 
         XStreamBrokerContext context = new XStreamBrokerContext();
         brokerService.setBrokerContext(context);

http://git-wip-us.apache.org/repos/asf/activemq/blob/82e12f0e/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
index 35a970f..96a0e8e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
@@ -67,7 +67,7 @@ public class FailoverTimeoutTest {
             bs.stop();
         }
     }
-
+    
     protected String getTransportUri() {
         return "tcp://localhost:0";
     }


Mime
View raw message