This closes #2507

artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java

@@ -342,7 +342,7 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
       byte high = (byte) (delim >> 8 & 0xFF); // high byte
 
       int lasPos = 0;
-      for (int i = 0; i < data.length; i += 2) {
+      for (int i = 0; i + 1 < data.length; i += 2) {
          if (data[i] == low && data[i + 1] == high) {
             byte[] bytes = new byte[i - lasPos];
             System.arraycopy(data, lasPos, bytes, 0, bytes.length);
@@ -439,7 +439,7 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
       final byte low = (byte) (c & 0xFF); // low byte
       final byte high = (byte) (c >> 8 & 0xFF); // high byte
 
-      for (int i = 0; i < data.length; i += 2) {
+      for (int i = 0; i + 1 < data.length; i += 2) {
          if (data[i] == low && data[i + 1] == high) {
             return true;
          }

artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java

@@ -58,7 +58,7 @@ public class ActiveMQJMSContext implements JMSContext {
    private volatile Message lastMessagesWaitingAck;
 
    private final ActiveMQConnectionForContext connection;
-   private Session session;
+   private volatile Session session;
    private boolean autoStart = ActiveMQJMSContext.DEFAULT_AUTO_START;
    private MessageProducer innerProducer;
    private boolean xa;
@@ -91,6 +91,7 @@ public class ActiveMQJMSContext implements JMSContext {
    }
 
    public Session getSession() {
+      checkSession();
       return session;
    }
 

artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java

@@ -345,7 +345,7 @@ public class ArtemisCreatePlugin extends ArtemisAbstractPlugin {
       Charset charset = StandardCharsets.UTF_8;
 
       String content = new String(Files.readAllBytes(original), charset);
-      for (int i = 0; i < replacePairs.length; i += 2) {
+      for (int i = 0; i + 1 < replacePairs.length; i += 2) {
          content = content.replaceAll(replacePairs[i], replacePairs[i + 1]);
       }
       Files.write(target, content.getBytes(charset));

artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueStatus.java

@@ -37,7 +37,7 @@ public enum QueueStatus {
    }
 
    public static QueueStatus fromID(short id) {
-      if (id < 0 || id > values.length) {
+      if (id < 0 || id >= values.length) {
          return null;
       } else {
          return values[id];