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 13:29:31 UTC
[cxf] branch 3.2.x-fixes updated (0d76d5e -> 4ebd5a0)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 0d76d5e Fix CXF-7966: allows more flexibility in Beanspector (#510)
new 5cc7dc8 Fixing a few bugs
new 4ebd5a0 Recording .gitmergeinfo Changes
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:
.gitmergeinfo | 1 +
.../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(+), 8 deletions(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4ebd5a025d337f81ec99807a2ca58762180847db
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jun 19 13:47:36 2019 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a22e4f6..bb82d5c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -200,6 +200,7 @@ B 55afdc9373257d8c111468926c7278b4e9b28a61
B 5601ae06f2f85e09c2319a0086a1a1ea5a1df270
B 57025af84e7fd41e3a0832385adce91c086957e3
B 5707393922f2cc5997caab5489ad55b7d70eb949
+B 58ad2b859ee422c76787b1d33a3a82a58764da0e
B 58d9bcd12059c46713902b756881e80c2f28f030
B 58e72337226f4e963abfc6f1a65625d86b7003b5
B 58e9812a84a1a98d1f0699b59a86a147c847cb2f
[cxf] 01/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 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5cc7dc8d3bc663c9382abc8585a4071e8dca1148
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jun 19 13:47:05 2019 +0100
Fixing a few bugs
(cherry picked from commit d78d7d9cc78fe9d357326c8052a03690860bd171)
---
.../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 ece96b3..2445369 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 97514d2..792e15a 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);