This closes #2642

apache · Apr 25, 2019 · 93a5feb · 93a5feb
2 parents 0043d9c + 9ac7702
commit 93a5feb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 43 deletions.
diff --git a/...ava/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java b/...ava/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
@@ -355,8 +355,6 @@ public void referenceOriginalMessage(final Message original, String originalQueu
 
    @Override
    public Message copy() {
-      new Exception("hmmmmm").printStackTrace();
-      System.exit(-1);
       SequentialFile newfile = storageManager.createFileForLargeMessage(messageID, durable);
 
       Message newMessage = new LargeServerMessageImpl(this, properties, newfile, messageID);

diff --git a/...ver/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java b/...ver/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
@@ -61,7 +61,6 @@
 import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy;
 import org.junit.AfterClass;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -83,7 +82,6 @@ public static void clearProperties() {
       System.clearProperty("ninetyTwoProp");
    }
 
-
    protected String getConfigurationName() {
       return "ConfigurationTest-full-config.xml";
    }
@@ -544,61 +542,35 @@ public void testSecurityRoleMapping() throws Exception {
       Set<Role> roles = securityRoles.get("#");
 
       //cn=mygroup,dc=local,dc=com = amq1
-      Role testRole1 = new Role("cn=mygroup,dc=local,dc=com",false, false, false,
-                               false, true, false, false,
-                               false, false, false);
+      Role testRole1 = new Role("cn=mygroup,dc=local,dc=com", false, false, false, false, true, false, false, false, false, false);
 
       //myrole1 = amq1 + amq2
-      Role testRole2 = new Role("myrole1",false, false, false,
-                                false, true, true, false,
-                                false, false, false);
+      Role testRole2 = new Role("myrole1", false, false, false, false, true, true, false, false, false, false);
 
       //myrole3 = amq3 + amq4
-      Role testRole3 = new Role("myrole3",false, false, true,
-                                true, false, false, false,
-                                false, false, false);
+      Role testRole3 = new Role("myrole3", false, false, true, true, false, false, false, false, false, false);
 
       //myrole4 = amq5 + amq!@#$%^&*() + amq6
-      Role testRole4 = new Role("myrole4",true, true, false,
-                                false, false, false, false,
-                                true, true, true);
+      Role testRole4 = new Role("myrole4", true, true, false, false, false, false, false, true, true, true);
 
       //myrole5 = amq4 = amq3 + amq4
-      Role testRole5 = new Role("myrole5",false, false, true,
-                                true, false, false, false,
-                                false, false, false);
+      Role testRole5 = new Role("myrole5", false, false, true, true, false, false, false, false, false, false);
 
-      Role testRole6 = new Role("amq1",false, false, false,
-                                false, true, false, false,
-                                false, false, false);
+      Role testRole6 = new Role("amq1", false, false, false, false, true, false, false, false, false, false);
 
-      Role testRole7 = new Role("amq2",false, false, false,
-                                false, false, true, false,
-                                false, false, false);
+      Role testRole7 = new Role("amq2", false, false, false, false, false, true, false, false, false, false);
 
-      Role testRole8 = new Role("amq3",false, false, true,
-                                false, false, false, false,
-                                false, false, false);
+      Role testRole8 = new Role("amq3", false, false, true, false, false, false, false, false, false, false);
 
-      Role testRole9 = new Role("amq4",false, false, true,
-                                true, false, false, false,
-                                false, false, false);
+      Role testRole9 = new Role("amq4", false, false, true, true, false, false, false, false, false, false);
 
-      Role testRole10 = new Role("amq5",false, false, false,
-                                false, false, false, false,
-                                false, true, true);
+      Role testRole10 = new Role("amq5", false, false, false, false, false, false, false, false, true, true);
 
-      Role testRole11 = new Role("amq6",false, true, false,
-                                false, false, false, false,
-                                true, false, false);
+      Role testRole11 = new Role("amq6", false, true, false, false, false, false, false, true, false, false);
 
-      Role testRole12 = new Role("amq7",false, false, false,
-                                false, false, false, true,
-                                false, false, false);
+      Role testRole12 = new Role("amq7", false, false, false, false, false, false, true, false, false, false);
 
-      Role testRole13 = new Role("amq!@#$%^&*()",true, false, false,
-                                false, false, false, false,
-                                false, false, false);
+      Role testRole13 = new Role("amq!@#$%^&*()", true, false, false, false, false, false, false, false, false, false);
 
       assertEquals(13, roles.size());
       assertTrue(roles.contains(testRole1));