You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/10/30 16:32:55 UTC
[1/6] qpid-broker-j git commit: QPID-7885: [Broker-J] Use jaxb
dependency with legacy JMS client as it depends on jaxb base64 encoding
Repository: qpid-broker-j
Updated Branches:
refs/heads/master bb57b5159 -> 35998c406
QPID-7885: [Broker-J] Use jaxb dependency with legacy JMS client as it depends on jaxb base64 encoding
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/35998c40
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/35998c40
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/35998c40
Branch: refs/heads/master
Commit: 35998c406fd22606c60202308ecad75cfed98f84
Parents: a045ea8
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Oct 30 16:30:30 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Oct 30 16:32:41 2018 +0000
----------------------------------------------------------------------
bdbstore/systests/pom.xml | 12 +++++++
joramtests/pom.xml | 16 +++++++++
perftests/pom.xml | 18 ++++++++--
pom.xml | 12 +++++++
qpid-perftests-systests/pom.xml | 12 +++++++
systests/end-to-end-conversion-tests/pom.xml | 2 +-
systests/qpid-systests-http-management/pom.xml | 11 ++++++
systests/qpid-systests-jms_1.1/pom.xml | 11 ++++++
systests/qpid-systests-spawn-admin/pom.xml | 12 +++++++
tck/pom.xml | 16 +++++++++
tools/pom.xml | 40 +++++++++++++++++++++
11 files changed, 159 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/bdbstore/systests/pom.xml
----------------------------------------------------------------------
diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml
index 9a7c050..1036aba 100644
--- a/bdbstore/systests/pom.xml
+++ b/bdbstore/systests/pom.xml
@@ -123,10 +123,22 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/joramtests/pom.xml
----------------------------------------------------------------------
diff --git a/joramtests/pom.xml b/joramtests/pom.xml
index 179d21a..6fdfce8 100644
--- a/joramtests/pom.xml
+++ b/joramtests/pom.xml
@@ -282,6 +282,14 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
</dependencies>
</profile>
@@ -304,6 +312,14 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
</dependencies>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/perftests/pom.xml
----------------------------------------------------------------------
diff --git a/perftests/pom.xml b/perftests/pom.xml
index bd1c6eb..b636cc1 100644
--- a/perftests/pom.xml
+++ b/perftests/pom.xml
@@ -362,7 +362,14 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
</dependencies>
</profile>
@@ -384,7 +391,14 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ce1d736..69442be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,7 @@
<httpclient-version>4.5.3</httpclient-version>
<qpid-jms-client-version>0.36.0</qpid-jms-client-version>
<qpid-jms-client-amqp-0-x-version>6.3.3</qpid-jms-client-amqp-0-x-version>
+ <jaxb-api-version>2.3.1</jaxb-api-version>
<exec-maven-plugin-version>1.6.0</exec-maven-plugin-version>
<javacc-maven-plugin-version>2.6</javacc-maven-plugin-version>
@@ -452,6 +453,17 @@
<artifactId>qpid-client</artifactId>
<version>${qpid-jms-client-amqp-0-x-version}</version>
</dependency>
+ <!-- qpid-client requires jaxb-api for Base64 encoding-->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/qpid-perftests-systests/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-perftests-systests/pom.xml b/qpid-perftests-systests/pom.xml
index afccd22..447514c 100644
--- a/qpid-perftests-systests/pom.xml
+++ b/qpid-perftests-systests/pom.xml
@@ -39,6 +39,18 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>test</scope>
</dependency>
<!-- other deps -->
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/systests/end-to-end-conversion-tests/pom.xml
----------------------------------------------------------------------
diff --git a/systests/end-to-end-conversion-tests/pom.xml b/systests/end-to-end-conversion-tests/pom.xml
index 42a1a7d..73abac0 100644
--- a/systests/end-to-end-conversion-tests/pom.xml
+++ b/systests/end-to-end-conversion-tests/pom.xml
@@ -34,7 +34,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<amqp10ClientGavs>org.apache.qpid:qpid-jms-client:${qpid-jms-client-version},org.slf4j:slf4j-simple:${slf4j-version}</amqp10ClientGavs>
- <amqp0xClientGavs>org.apache.qpid:qpid-client:${qpid-jms-client-amqp-0-x-version},org.apache.geronimo.specs:geronimo-jms_1.1_spec:${geronimo-jms-1-1-version},org.slf4j:slf4j-simple:${slf4j-version}</amqp0xClientGavs>
+ <amqp0xClientGavs>org.apache.qpid:qpid-client:${qpid-jms-client-amqp-0-x-version},org.apache.geronimo.specs:geronimo-jms_1.1_spec:${geronimo-jms-1-1-version},org.slf4j:slf4j-simple:${slf4j-version},javax.xml.bind:jaxb-api:${jaxb-api-version},org.glassfish.jaxb:jaxb-runtime:${jaxb-api-version}</amqp0xClientGavs>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/systests/qpid-systests-http-management/pom.xml
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-http-management/pom.xml b/systests/qpid-systests-http-management/pom.xml
index 7135629..2da15b0 100644
--- a/systests/qpid-systests-http-management/pom.xml
+++ b/systests/qpid-systests-http-management/pom.xml
@@ -149,6 +149,17 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/systests/qpid-systests-jms_1.1/pom.xml
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_1.1/pom.xml b/systests/qpid-systests-jms_1.1/pom.xml
index 1897cc9..4f29cc7 100644
--- a/systests/qpid-systests-jms_1.1/pom.xml
+++ b/systests/qpid-systests-jms_1.1/pom.xml
@@ -100,6 +100,17 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/systests/qpid-systests-spawn-admin/pom.xml
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-spawn-admin/pom.xml b/systests/qpid-systests-spawn-admin/pom.xml
index e252b66..d5ab714 100644
--- a/systests/qpid-systests-spawn-admin/pom.xml
+++ b/systests/qpid-systests-spawn-admin/pom.xml
@@ -79,10 +79,22 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/pom.xml b/tck/pom.xml
index a71a101..707a4cc 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -661,6 +661,14 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
</dependencies>
</profile>
@@ -684,6 +692,14 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
</dependencies>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index d0bed0e..b3d0f93 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -135,6 +135,16 @@
<artifactId>geronimo-jms_1.1_spec</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</profile>
<profile>
@@ -172,6 +182,16 @@
<artifactId>geronimo-jms_1.1_spec</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</profile>
<profile>
@@ -236,6 +256,16 @@
<artifactId>geronimo-jms_1.1_spec</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</profile>
<profile>
@@ -273,6 +303,16 @@
<artifactId>geronimo-jms_1.1_spec</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</profile>
<profile>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[6/6] qpid-broker-j git commit: QPID-7885: [Broker-J] Upgrade apache
parent pom to version 21 and update maven plugin versions
Posted by or...@apache.org.
QPID-7885: [Broker-J] Upgrade apache parent pom to version 21 and update maven plugin versions
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/3ff81dac
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/3ff81dac
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/3ff81dac
Branch: refs/heads/master
Commit: 3ff81dac366e77c99564e5434d5679fe9f835d02
Parents: 16b5592
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Oct 30 14:37:20 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Oct 30 16:32:41 2018 +0000
----------------------------------------------------------------------
pom.xml | 42 ++++++++++++++++++++++++++++--------------
1 file changed, 28 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/3ff81dac/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 429cca3..ce1d736 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>21</version>
</parent>
<groupId>org.apache.qpid</groupId>
@@ -131,25 +131,25 @@
<mockito-version>2.22.0</mockito-version>
<netty-version>4.1.28.Final</netty-version>
<hamcrest-version>1.3</hamcrest-version>
- <maven-core-version>3.5.0</maven-core-version>
- <maven-resolver-version>1.0.3</maven-resolver-version>
+ <maven-core-version>3.5.4</maven-core-version>
+ <maven-resolver-version>1.1.1</maven-resolver-version>
<httpclient-version>4.5.3</httpclient-version>
<qpid-jms-client-version>0.36.0</qpid-jms-client-version>
<qpid-jms-client-amqp-0-x-version>6.3.3</qpid-jms-client-amqp-0-x-version>
- <exec-maven-plugin-version>1.3.2</exec-maven-plugin-version>
+ <exec-maven-plugin-version>1.6.0</exec-maven-plugin-version>
<javacc-maven-plugin-version>2.6</javacc-maven-plugin-version>
- <maven-rar-plugin-version>2.3</maven-rar-plugin-version>
- <license-maven-plugin-version>1.6</license-maven-plugin-version>
- <jacoco-plugin-version>0.7.0.201403182114</jacoco-plugin-version>
- <maven-jxr-plugin-version>2.3</maven-jxr-plugin-version>
- <findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version>
- <jacoco-plugin-version>0.7.5.201505241946</jacoco-plugin-version>
- <apache-rat-plugin-version>0.11</apache-rat-plugin-version>
+ <maven-rar-plugin-version>2.4</maven-rar-plugin-version>
+ <license-maven-plugin-version>1.8</license-maven-plugin-version>
+ <maven-jxr-plugin-version>3.0.0</maven-jxr-plugin-version>
+ <findbugs-maven-plugin-version>3.0.5</findbugs-maven-plugin-version>
+ <jacoco-plugin-version>0.8.2</jacoco-plugin-version>
+ <apache-rat-plugin-version>0.12</apache-rat-plugin-version>
<maven-docbx-plugin-version>2.0.15</maven-docbx-plugin-version>
<maven-docbook-xml-plugin-version>5.0-all</maven-docbook-xml-plugin-version>
- <buildnumber-maven-plugin-version>1.3</buildnumber-maven-plugin-version>
- <maven-jar-plugin-version>3.0.0</maven-jar-plugin-version>
+ <buildnumber-maven-plugin-version>1.4</buildnumber-maven-plugin-version>
+ <maven-jar-plugin-version>3.1.0</maven-jar-plugin-version>
+ <maven-surefire-report-plugin-version>2.22.0</maven-surefire-report-plugin-version>
</properties>
<modules>
@@ -746,6 +746,21 @@
<artifactId>exec-maven-plugin</artifactId>
<version>${exec-maven-plugin-version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${maven-surefire-report-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M2</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -953,7 +968,6 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/6] qpid-broker-j git commit: QPID-8253: [Broker-J] Hanlde null
server names returned from SSLEngine SSLParameters
Posted by or...@apache.org.
QPID-8253: [Broker-J] Hanlde null server names returned from SSLEngine SSLParameters
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/4ebae174
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/4ebae174
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/4ebae174
Branch: refs/heads/master
Commit: 4ebae1747328e19519fa670974dfac92fb852a71
Parents: bb57b51
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Oct 30 14:45:59 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Oct 30 16:32:41 2018 +0000
----------------------------------------------------------------------
.../transport/network/security/ssl/QpidBestFitX509KeyManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4ebae174/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidBestFitX509KeyManager.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidBestFitX509KeyManager.java b/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidBestFitX509KeyManager.java
index 3cb06ac..e7e00a7 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidBestFitX509KeyManager.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidBestFitX509KeyManager.java
@@ -120,7 +120,7 @@ public class QpidBestFitX509KeyManager extends X509ExtendedKeyManager
{
Date currentDate = new Date();
final List<SNIServerName> serverNames = engine.getSSLParameters().getServerNames();
- if(serverNames.isEmpty())
+ if(serverNames == null || serverNames.isEmpty())
{
return getDefaultServerAlias(keyType, issuers, engine);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/6] qpid-broker-j git commit: QPID-7885: [Broker-J] Update
PluggableProcessor to handle NoSuchFileException on generation of service
files
Posted by or...@apache.org.
QPID-7885: [Broker-J] Update PluggableProcessor to handle NoSuchFileException on generation of service files
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/73745fe8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/73745fe8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/73745fe8
Branch: refs/heads/master
Commit: 73745fe8be84dd3b94e618b19c44dccbdee0d71f
Parents: 3ff81da
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Oct 30 14:44:42 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Oct 30 16:32:41 2018 +0000
----------------------------------------------------------------------
.../qpid/server/plugin/PluggableProcessor.java | 55 ++++++++++++--------
1 file changed, 33 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/73745fe8/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableProcessor.java
----------------------------------------------------------------------
diff --git a/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableProcessor.java b/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableProcessor.java
index ba55f6c..b74130c 100644
--- a/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableProcessor.java
+++ b/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableProcessor.java
@@ -26,6 +26,8 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.file.NoSuchFileException;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -146,21 +148,20 @@ public class PluggableProcessor extends AbstractProcessor
try
{
FileObject serviceFile = filer.createResource(StandardLocation.CLASS_OUTPUT, "", relativeName);
- PrintWriter pw = new PrintWriter(new OutputStreamWriter(serviceFile.openOutputStream(), "UTF-8"));
-
- for (String headerLine : License.LICENSE)
- {
- pw.println("#" + headerLine);
- }
- pw.println("#");
- pw.println("# Note: Parts of this file are auto-generated from annotations.");
- pw.println("#");
- for (String implementation : factoryImplementations.get(serviceName))
+ try(PrintWriter pw = new PrintWriter(new OutputStreamWriter(serviceFile.openOutputStream(), "UTF-8")))
{
- pw.println(implementation);
+ for (String headerLine : License.LICENSE)
+ {
+ pw.println("#" + headerLine);
+ }
+ pw.println("#");
+ pw.println("# Note: Parts of this file are auto-generated from annotations.");
+ pw.println("#");
+ for (String implementation : factoryImplementations.get(serviceName))
+ {
+ pw.println(implementation);
+ }
}
-
- pw.close();
}
catch (IOException e)
{
@@ -180,28 +181,38 @@ public class PluggableProcessor extends AbstractProcessor
String relativeName = "META-INF/services/" + serviceName;
try
{
-
FileObject existingFile = filer.getResource(StandardLocation.CLASS_OUTPUT, "", relativeName);
- BufferedReader r = new BufferedReader(new InputStreamReader(existingFile.openInputStream(), "UTF-8"));
- String line;
- while((line=r.readLine())!=null)
+ try(BufferedReader r = new BufferedReader(new InputStreamReader(existingFile.openInputStream(), "UTF-8")))
{
- if(!line.matches(" *#"))
+ String line;
+ while ((line = r.readLine()) != null)
{
- factoryImplementations.get(serviceName).add(line);
+ if (!line.matches(" *#"))
+ {
+ factoryImplementations.get(serviceName).add(line);
+ }
}
}
- r.close();
}
- catch (FileNotFoundException e)
+ catch (NoSuchFileException | FileNotFoundException e)
{
// no existing file (ignore)
}
catch (IOException e)
{
+ String errorMessage;
+ try(StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw))
+ {
+ e.printStackTrace(pw);
+ errorMessage = sw.toString();
+ }
+ catch (IOException ioe)
+ {
+ errorMessage = e.getLocalizedMessage();
+ }
processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
"Error loading existing services file: " + relativeName
- + " - " + e.getLocalizedMessage());
+ + " - " + errorMessage);
}
return relativeName;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[5/6] qpid-broker-j git commit: QPID-7885: Fix failing tests
Posted by or...@apache.org.
QPID-7885: Fix failing tests
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/a045ea8a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/a045ea8a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/a045ea8a
Branch: refs/heads/master
Commit: a045ea8a749fa3ee6a76e6398b35d39b4bf8af76
Parents: 73745fe
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Oct 30 16:14:17 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Oct 30 16:32:41 2018 +0000
----------------------------------------------------------------------
.../berkeleydb/BDBVirtualHostImplTest.java | 25 +++-----------
.../qpid/server/model/BrokerTestHelper.java | 34 +++++++++++++-------
.../server/security/NonJavaKeyStoreTest.java | 17 +++-------
.../virtualhost/jdbc/JDBCVirtualHostTest.java | 22 +++----------
.../jms_1_1/extensions/tls/TlsTest.java | 4 +++
5 files changed, 39 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a045ea8a/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java b/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java
index 52f27eb..de5f99a 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java
@@ -25,8 +25,6 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import java.io.File;
import java.util.HashMap;
@@ -38,13 +36,8 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.VirtualHostNode;
-import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.util.FileUtils;
import org.apache.qpid.test.utils.TestFileUtils;
import org.apache.qpid.test.utils.UnitTestBase;
@@ -60,22 +53,12 @@ public class BDBVirtualHostImplTest extends UnitTestBase
{
assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.BDB)));
- Broker broker = BrokerTestHelper.createBrokerMock();
-
- TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance();
- when(broker.getTaskExecutor()).thenReturn(taskExecutor);
- when(broker.getChildExecutor()).thenReturn(taskExecutor);
-
-
_storePath = TestFileUtils.createTestDirectory();
- _node = mock(VirtualHostNode.class);
- when(_node.getParent()).thenReturn(broker);
- when(_node.getModel()).thenReturn(BrokerModel.getInstance());
- when(_node.getTaskExecutor()).thenReturn(taskExecutor);
- when(_node.getChildExecutor()).thenReturn(taskExecutor);
- when(_node.getConfigurationStore()).thenReturn(mock(DurableConfigurationStore.class));
- when(_node.getId()).thenReturn(UUID.randomUUID());
+ _node = BrokerTestHelper.createVirtualHostNodeMock("testNode",
+ true,
+ BrokerTestHelper.createAccessControlMock(),
+ BrokerTestHelper.createBrokerMock());
}
@After
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a045ea8a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
index db236f1..a8d594c 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
@@ -20,10 +20,9 @@
*/
package org.apache.qpid.server.model;
-import static org.mockito.ArgumentMatchers.isNotNull;
-import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings;
@@ -171,9 +170,28 @@ public class BrokerTestHelper
final UnitTestBase testBase)
{
ConfiguredObjectFactory objectFactory = broker.getObjectFactory();
+ String virtualHostNodeName = String.format("%s_%s", attributes.get(VirtualHostNode.NAME), "_node");
+ VirtualHostNode virtualHostNode =
+ createVirtualHostNodeMock(virtualHostNodeName, defaultVHN, accessControl, broker);
+
+ AbstractVirtualHost
+ host = (AbstractVirtualHost) objectFactory.create(VirtualHost.class, attributes, virtualHostNode );
+ host.start();
+ when(virtualHostNode.getVirtualHost()).thenReturn(host);
+ _createdVirtualHosts.add(host);
+
+ testBase.registerTearDown(_closeVirtualHosts);
+ return host;
+ }
+
+ public static VirtualHostNode createVirtualHostNodeMock(final String virtualHostNodeName,
+ final boolean defaultVHN,
+ final AccessControl accessControl,
+ final Broker<?> broker)
+ {
+ ConfiguredObjectFactory objectFactory = broker.getObjectFactory();
VirtualHostNode virtualHostNode = mockWithSystemPrincipalAndAccessControl(VirtualHostNode.class, SYSTEM_PRINCIPAL, accessControl);
- String virtualHostNodeName = String.format("%s_%s", attributes.get(VirtualHostNode.NAME), "_node");
when(virtualHostNode.getName()).thenReturn( virtualHostNodeName);
when(virtualHostNode.getTaskExecutor()).thenReturn(TASK_EXECUTOR);
when(virtualHostNode.getChildExecutor()).thenReturn(TASK_EXECUTOR);
@@ -194,15 +212,7 @@ public class BrokerTestHelper
when(virtualHostNode.getTaskExecutor()).thenReturn(TASK_EXECUTOR);
when(virtualHostNode.getChildExecutor()).thenReturn(TASK_EXECUTOR);
when(virtualHostNode.createPreferenceStore()).thenReturn(mock(PreferenceStore.class));
-
- AbstractVirtualHost
- host = (AbstractVirtualHost) objectFactory.create(VirtualHost.class, attributes, virtualHostNode );
- host.start();
- when(virtualHostNode.getVirtualHost()).thenReturn(host);
- _createdVirtualHosts.add(host);
-
- testBase.registerTearDown(_closeVirtualHosts);
- return host;
+ return virtualHostNode;
}
public static QueueManagingVirtualHost<?> createVirtualHost(String name,
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a045ea8a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
index e8589e8..d5f500e 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
@@ -57,26 +57,21 @@ import org.junit.Test;
import org.mockito.ArgumentMatcher;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.MessageLogger;
import org.apache.qpid.server.logging.messages.KeyStoreMessages;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.KeyStore;
-import org.apache.qpid.server.model.Model;
import org.apache.qpid.test.utils.TestFileUtils;
import org.apache.qpid.test.utils.UnitTestBase;
public class NonJavaKeyStoreTest extends UnitTestBase
{
- private final Broker<?> _broker = mock(Broker.class);
- private final TaskExecutor _taskExecutor = CurrentThreadTaskExecutor.newStartedInstance();
- private final Model _model = BrokerModel.getInstance();
- private final ConfiguredObjectFactory _factory = _model.getObjectFactory();
+ private Broker<?> _broker;
+ private ConfiguredObjectFactory _factory;
private List<File> _testResources;
private MessageLogger _messageLogger;
@@ -84,11 +79,9 @@ public class NonJavaKeyStoreTest extends UnitTestBase
public void setUp() throws Exception
{
_messageLogger = mock(MessageLogger.class);
- when(_broker.getTaskExecutor()).thenReturn(_taskExecutor);
- when(_broker.getChildExecutor()).thenReturn(_taskExecutor);
- when(_broker.getModel()).thenReturn(_model);
+ _broker = BrokerTestHelper.createBrokerMock();
when(_broker.getEventLogger()).thenReturn(new EventLogger(_messageLogger));
- when(((Broker) _broker).getCategoryClass()).thenReturn(Broker.class);
+ _factory = _broker.getObjectFactory();
_testResources = new ArrayList<>();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a045ea8a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
index 3b69808..395abe5 100644
--- a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
+++ b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
@@ -22,7 +22,6 @@ package org.apache.qpid.server.virtualhost.jdbc;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import java.util.Arrays;
import java.util.Collections;
@@ -37,13 +36,9 @@ import org.junit.Test;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
-import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.store.jdbc.JDBCContainer;
@@ -75,19 +70,10 @@ public class JDBCVirtualHostTest extends UnitTestBase
@Test
public void testInvalidTableNamePrefix() throws Exception
{
- final VirtualHostNode vhn = mock(VirtualHostNode.class);
- when(vhn.getCategoryClass()).thenReturn(VirtualHostNode.class);
- when(vhn.getChildExecutor()).thenReturn(_taskExecutor);
- final ConfiguredObjectFactoryImpl factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
- when(vhn.getObjectFactory()).thenReturn(factory);
- when(vhn.getModel()).thenReturn(factory.getModel());
-
- EventLogger eventLogger = mock(EventLogger.class);
- SystemConfig systemConfig = mock(SystemConfig.class);
- when(systemConfig.getEventLogger()).thenReturn(eventLogger);
- Broker broker = mock(Broker.class);
- when(broker.getParent()).thenReturn(systemConfig);
- when(vhn.getParent()).thenReturn(broker);
+ final VirtualHostNode vhn = BrokerTestHelper.createVirtualHostNodeMock("testNode",
+ true,
+ BrokerTestHelper.createAccessControlMock(),
+ BrokerTestHelper.createBrokerMock());
Map<String, Object> attributes = new HashMap<>();
attributes.put(ConfiguredObject.NAME, getTestName());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a045ea8a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java
index 7f61e4f..8ece2c2 100644
--- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java
@@ -484,6 +484,10 @@ public class TlsTest extends JmsTestBase
getProtocol(),
is(not(equalTo(Protocol.AMQP_1_0))));
+ assumeThat("QPID-8255: certificate can only be loaded using jks keystore ",
+ java.security.KeyStore.getDefaultType(),
+ is(equalTo("jks")));
+
//Start the broker (NEEDing client certificate authentication)
int port = configureTlsPort(getTestPortName(), true, false, false);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[4/6] qpid-broker-j git commit: QPID-8254: [Broker-J] Stop using
illegal ascii characters in java keystore passwords
Posted by or...@apache.org.
QPID-8254: [Broker-J] Stop using illegal ascii characters in java keystore passwords
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/16b5592f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/16b5592f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/16b5592f
Branch: refs/heads/master
Commit: 16b5592f12ccb841e432f5e16c4851c21ccc66cf
Parents: 4ebae17
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Oct 30 15:29:02 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Oct 30 16:32:41 2018 +0000
----------------------------------------------------------------------
.../qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java | 2 +-
.../java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/16b5592f/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
index f596a8d..648f9fd 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
@@ -324,7 +324,7 @@ public class AutoGeneratedSelfSignedKeyStoreImpl
java.security.KeyStore inMemoryKeyStore = java.security.KeyStore.getInstance(java.security.KeyStore.getDefaultType());
byte[] bytes = new byte[64];
- char[] chars = new char[64];
+ char[] chars = "".toCharArray();
RANDOM.nextBytes(bytes);
StandardCharsets.US_ASCII.decode(ByteBuffer.wrap(bytes)).get(chars);
inMemoryKeyStore.load(null, chars);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/16b5592f/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
index 8beaf19..c8a4670 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
@@ -222,7 +222,7 @@ public class NonJavaKeyStoreImpl extends AbstractKeyStore<NonJavaKeyStoreImpl> i
java.security.KeyStore inMemoryKeyStore = java.security.KeyStore.getInstance(java.security.KeyStore.getDefaultType());
byte[] bytes = new byte[64];
- char[] chars = new char[64];
+ char[] chars = "".toCharArray();
RANDOM.nextBytes(bytes);
StandardCharsets.US_ASCII.decode(ByteBuffer.wrap(bytes)).get(chars);
inMemoryKeyStore.load(null, chars);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org