camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [2/2] camel git commit: Camel-Hazelcast: Removed deprecated code
Date Tue, 14 Mar 2017 13:50:48 GMT
Camel-Hazelcast: Removed deprecated code


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b537350c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b537350c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b537350c

Branch: refs/heads/master
Commit: b537350cb941b664eff9a4ebd5315c622e9bef55
Parents: 91ecb0d
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Tue Mar 14 14:50:10 2017 +0100
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Tue Mar 14 14:50:10 2017 +0100

----------------------------------------------------------------------
 .../aggregate/hazelcast/HazelcastAggregationRepository.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b537350c/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 309aee5..e84f0f6 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -38,6 +38,7 @@ import org.apache.camel.spi.OptimisticLockingAggregationRepository;
 import org.apache.camel.spi.RecoverableAggregationRepository;
 import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -345,7 +346,7 @@ public class HazelcastAggregationRepository extends ServiceSupport
                 // if no commit occurs during the timeout. So we are still consistent whether
local node crashes.
                 TransactionOptions tOpts = new TransactionOptions();
 
-                tOpts.setTransactionType(TransactionOptions.TransactionType.LOCAL);
+                tOpts.setTransactionType(TransactionOptions.TransactionType.ONE_PHASE);
                 TransactionContext tCtx = hzInstance.newTransactionContext(tOpts);
 
                 try {
@@ -405,7 +406,7 @@ public class HazelcastAggregationRepository extends ServiceSupport
         if (recoveryInterval < 0) {
             throw new IllegalArgumentException("Recovery interval must be zero or a positive
integer.");
         }
-        ObjectHelper.notEmpty(mapName, "repositoryName");
+        StringHelper.notEmpty(mapName, "repositoryName");
         if (useLocalHzInstance)  {
             Config cfg = new XmlConfigBuilder().build();
             cfg.setProperty("hazelcast.version.check.enabled", "false");


Mime
View raw message