Author: davsclaus
Date: Sat Apr 21 14:31:45 2012
New Revision: 1328671
URL: http://svn.apache.org/viewvc?rev=1328671&view=rev
Log:
CAMEL-5185 Disable the update checker of hazelcast
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
camel/branches/camel-2.9.x/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1327566
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java?rev=1328671&r1=1328670&r2=1328671&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
Sat Apr 21 14:31:45 2012
@@ -18,6 +18,8 @@ package org.apache.camel.component.hazel
import java.util.Map;
+import com.hazelcast.config.Config;
+import com.hazelcast.config.XmlConfigBuilder;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.CamelContext;
@@ -110,7 +112,10 @@ public class HazelcastComponent extends
super.doStart();
if (hazelcastInstance == null) {
createOwnInstance = true;
- hazelcastInstance = Hazelcast.newHazelcastInstance(null);
+ Config config = new XmlConfigBuilder().build();
+ // Disable the version check
+
config.getProperties().setProperty("hazelcast.version.check.enabled", "false");
+ hazelcastInstance = Hazelcast.newHazelcastInstance(config);
}
}
Modified:
camel/branches/camel-2.9.x/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-hazelcast/src/test/resources/hazelcast-default.xml?rev=1328671&r1=1328670&r2=1328671&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
(original)
+++
camel/branches/camel-2.9.x/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
Sat Apr 21 14:31:45 2012
@@ -22,6 +22,11 @@
<name>dev</name>
<password>dev-pass</password>
</group>
+
+ <!-- Disable the version check -->
+ <properties>
+ <property name="hazelcast.version.check.enabled">false</property>
+ </properties>
<network>
<port auto-increment="true">5701</port>
