You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/08/14 16:40:52 UTC
[1/3] activemq-artemis git commit: ARTEMIS-2023 test showing NPE
Repository: activemq-artemis
Updated Branches:
refs/heads/master e549a153a -> 4637c27b5
ARTEMIS-2023 test showing NPE
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/71e664a7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/71e664a7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/71e664a7
Branch: refs/heads/master
Commit: 71e664a705e8a54adb530e3c769ce936fb851fb7
Parents: e549a15
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Aug 14 12:39:53 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Aug 14 12:40:30 2018 -0400
----------------------------------------------------------------------
.../src/main/resources/serial/cfserial.groovy | 72 +++++++++++++
...onFactoryConfigurationSerializationTest.java | 100 +++++++++++++++++++
2 files changed, 172 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/71e664a7/tests/compatibility-tests/src/main/resources/serial/cfserial.groovy
----------------------------------------------------------------------
diff --git a/tests/compatibility-tests/src/main/resources/serial/cfserial.groovy b/tests/compatibility-tests/src/main/resources/serial/cfserial.groovy
new file mode 100644
index 0000000..26085cd
--- /dev/null
+++ b/tests/compatibility-tests/src/main/resources/serial/cfserial.groovy
@@ -0,0 +1,72 @@
+package clients
+
+import io.netty.buffer.Unpooled
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers
+import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Create a client connection factory
+
+import org.apache.activemq.artemis.tests.compatibility.GroovyRun;
+import javax.jms.*;
+import org.apache.activemq.artemis.jms.client.*
+
+import java.nio.ByteBuffer
+
+file = arg[0]
+method = arg[1]
+version = arg[2]
+
+if (method.equals("write")) {
+ List<String> transportConfigurations = new ArrayList<>();
+ transportConfigurations.add("tst"); cfConfiguration = new ConnectionFactoryConfigurationImpl();
+ cfConfiguration.setName("np").setConnectorNames(transportConfigurations);
+ ActiveMQBuffer buffer = ActiveMQBuffers.dynamicBuffer(1024);
+ cfConfiguration.encode(buffer);
+ byte[] bytes = new byte[buffer.readableBytes()];
+ buffer.readBytes(bytes);
+
+
+
+ ObjectOutputStream objectOutputStream = new ObjectOutputStream(new FileOutputStream(file));
+ objectOutputStream.write(bytes);
+ objectOutputStream.close();
+} else {
+ ObjectInputStream inputStream = new ObjectInputStream(new FileInputStream(file))
+ ActiveMQBuffer buffer = ActiveMQBuffers.dynamicBuffer(1024);
+ while (true) {
+ int byteRead = inputStream.read()
+ if (byteRead < 0) {
+ break;
+ }
+
+ buffer.writeByte((byte)byteRead);
+ }
+ cfConfiguration = new ConnectionFactoryConfigurationImpl();
+ cfConfiguration.decode(buffer);
+
+ inputStream.close();
+}
+
+GroovyRun.assertEquals("np", cfConfiguration.getName())
+
+
+
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/71e664a7/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java
----------------------------------------------------------------------
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java
new file mode 100644
index 0000000..d40a8da
--- /dev/null
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.tests.compatibility;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.activemq.artemis.utils.FileUtil;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE;
+import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
+import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR;
+
+/**
+ * To run this test on the IDE and debug it, run the compatibility-tests through a command line once:
+ *
+ * cd /compatibility-tests
+ * mvn install -Ptests | tee output.log
+ *
+ * on the output.log you will see the output generated by {@link #getClasspathProperty(String)}
+ *
+ * On your IDE, edit the Run Configuration to your test and add those -D as parameters to your test.
+ * On Idea you would do the following:
+ *
+ * Run->Edit Configuration->Add ArtemisMeshTest and add your properties.
+ */
+@RunWith(Parameterized.class)
+public class ConnectionFactoryConfigurationSerializationTest extends VersionedBaseTest {
+
+ // this will ensure that all tests in this class are run twice,
+ // once with "true" passed to the class' constructor and once with "false"
+ @Parameterized.Parameters(name = "server={0}, producer={1}, consumer={2}")
+ public static Collection getParameters() {
+ // we don't need every single version ever released..
+ // if we keep testing current one against 2.4 and 1.4.. we are sure the wire and API won't change over time
+ List<Object[]> combinations = new ArrayList<>();
+
+ /*
+ // during development sometimes is useful to comment out the combinations
+ // and add the ones you are interested.. example:
+ */
+ // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
+ // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
+
+ combinations.addAll(combinatory(new Object[]{null}, new Object[]{ONE_FIVE, SNAPSHOT, TWO_FOUR}, new Object[]{ONE_FIVE, SNAPSHOT, TWO_FOUR}));
+ return combinations;
+ }
+
+ public ConnectionFactoryConfigurationSerializationTest(String server, String sender, String receiver) throws Exception {
+ super(server, sender, receiver);
+ }
+
+ @Before
+ public void beforeTest() throws Throwable {
+ FileUtil.deleteDirectory(serverFolder.getRoot());
+ serverFolder.getRoot().mkdirs();
+ setVariable(senderClassloader, "persistent", false);
+ startServer(serverFolder.getRoot(), senderClassloader, "1");
+ }
+
+ @After
+ public void afterTest() {
+ try {
+ stopServer(senderClassloader);
+ } catch (Throwable ignored) {
+ ignored.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testSerializeFactory() throws Throwable {
+ File file = serverFolder.newFile("objects.ser");
+ evaluate(senderClassloader, "serial/cfserial.groovy", file.getAbsolutePath(), "write", sender);
+ evaluate(receiverClassloader, "serial/cfserial.groovy", file.getAbsolutePath(), "read", receiver);
+ }
+
+}
+
[3/3] activemq-artemis git commit: This closes #2249
Posted by cl...@apache.org.
This closes #2249
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4637c27b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4637c27b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4637c27b
Branch: refs/heads/master
Commit: 4637c27b562dca8f9ff97d85e499a087771d657e
Parents: e549a15 4c51848
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Aug 14 12:40:44 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Aug 14 12:40:44 2018 -0400
----------------------------------------------------------------------
.../ConnectionFactoryConfigurationImpl.java | 2 +-
.../src/main/resources/serial/cfserial.groovy | 72 +++++++++++++
...onFactoryConfigurationSerializationTest.java | 100 +++++++++++++++++++
3 files changed, 173 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] activemq-artemis git commit: ARTEMIS-2023 Fix NPE
Posted by cl...@apache.org.
ARTEMIS-2023 Fix NPE
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4c51848b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4c51848b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4c51848b
Branch: refs/heads/master
Commit: 4c51848b58fc14bd63ba0a764c31d3ca1dbffc5e
Parents: 71e664a
Author: Michael André Pearce <mi...@me.com>
Authored: Tue Aug 14 07:04:06 2018 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Aug 14 12:40:31 2018 -0400
----------------------------------------------------------------------
.../jms/server/config/impl/ConnectionFactoryConfigurationImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4c51848b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
index ae71eca..c2ac0b6 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
@@ -640,7 +640,7 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf
deserializationWhiteList = BufferHelper.readNullableSimpleStringAsString(buffer);
- enable1xPrefixes = buffer.readableBytes() > 0 ? buffer.readBoolean() : null;
+ enable1xPrefixes = buffer.readableBytes() > 0 ? buffer.readBoolean() : ActiveMQClient.DEFAULT_ENABLE_1X_PREFIXES;
enableSharedClientID = buffer.readableBytes() > 0 ? buffer.readBoolean() : ActiveMQClient.DEFAULT_ENABLED_SHARED_CLIENT_ID;