You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2019/06/19 12:47:23 UTC
[cxf] branch master updated (5cef966 -> d78d7d9)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 5cef966 Fix CXF-7966: allows more flexibility in Beanspector (#510)
new 58ad2b8 Updating Spring Boot
new d78d7d9 Fixing a few bugs
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
parent/pom.xml | 2 +-
.../aegis/src/main/java/org/apache/cxf/aegis/util/UID.java | 4 ++--
.../java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java | 8 +++-----
.../java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java | 2 +-
4 files changed, 7 insertions(+), 9 deletions(-)
[cxf] 01/02: Updating Spring Boot
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 58ad2b859ee422c76787b1d33a3a82a58764da0e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jun 19 13:46:58 2019 +0100
Updating Spring Boot
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 790bd15..0860a37 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -188,7 +188,7 @@
<cxf.slf4j.version>1.7.26</cxf.slf4j.version>
<cxf.snakeyaml.version>1.24</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
- <cxf.spring.boot.version>2.1.5.RELEASE</cxf.spring.boot.version>
+ <cxf.spring.boot.version>2.1.6.RELEASE</cxf.spring.boot.version>
<cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
[cxf] 02/02: Fixing a few bugs
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d78d7d9cc78fe9d357326c8052a03690860bd171
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jun 19 13:47:05 2019 +0100
Fixing a few bugs
---
.../aegis/src/main/java/org/apache/cxf/aegis/util/UID.java | 4 ++--
.../java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java | 8 +++-----
.../java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/UID.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/UID.java
index 403ed8c..748b36d 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/UID.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/UID.java
@@ -18,11 +18,11 @@
*/
package org.apache.cxf.aegis.util;
-import java.util.Random;
+import java.security.SecureRandom;
public final class UID {
private static int counter;
- private static Random random = new Random(System.currentTimeMillis());
+ private static SecureRandom random = new SecureRandom();
private UID() {
//utility
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
index 1a33536..637cab7 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
@@ -944,17 +944,15 @@ public class RMTxStore implements RMStore {
return;
}
- Statement stmt = connection.createStatement();
// schemaName has been verified at setSchemaName(String)
- try {
+ try (Statement stmt = connection.createStatement()) {
stmt.executeUpdate(MessageFormat.format(CREATE_SCHEMA_STMT_STR,
schemaName));
} catch (SQLException ex) {
// assume it is already created or no authorization is provided (create one manually)
- } finally {
- stmt.close();
}
- stmt = connection.createStatement();
+
+ Statement stmt = connection.createStatement();
SQLException ex0 = null;
for (int i = 0; i < SET_SCHEMA_STMT_STRS.length; i++) {
try {
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
index 08d489d..5e5f0a3 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
@@ -828,7 +828,7 @@ public class RetransmissionQueueImpl implements RetransmissionQueue {
if (incept.getClass().getName().startsWith("org.apache.cxf.jaxws.interceptors")) {
retransmitChain.remove(incept);
} else if (incept instanceof PhaseInterceptor
- && (((PhaseInterceptor<?>)incept).getPhase() == Phase.MARSHAL)) {
+ && Phase.MARSHAL.equals(((PhaseInterceptor<?>)incept).getPhase())) {
// remove any interceptors from the marshal phase
retransmitChain.remove(incept);