activemq git commit: AMQ-7082 - fix compilation after merge

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

activemq git commit: AMQ-7082 - fix compilation after merge

cshannon
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 45d7676bd -> 505200b92


AMQ-7082 - fix compilation after merge


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

Branch: refs/heads/activemq-5.15.x
Commit: 505200b92a0d72666b6665f6026a97a8f215d895
Parents: 45d7676
Author: Christopher L. Shannon (cshannon) <[hidden email]>
Authored: Tue Nov 6 09:42:58 2018 -0500
Committer: Christopher L. Shannon (cshannon) <[hidden email]>
Committed: Tue Nov 6 09:42:58 2018 -0500

----------------------------------------------------------------------
 .../org/apache/activemq/store/kahadb/disk/page/PageFileTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/505200b9/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java
index b8dcc92..e4d0c94 100644
--- a/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java
+++ b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java
@@ -241,7 +241,6 @@ public class PageFileTest extends TestCase {
             pf2.unload();
         }
     }
-    }
 
     public void testBackgroundRecoveryIsThreadSafe() throws Exception {
 
@@ -334,4 +333,5 @@ public class PageFileTest extends TestCase {
                 return  freePages == 100100;
             }
         }, 12000000));
+    }
 }