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:25 UTC
[cxf] 02/02: Fixing a few bugs
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);