You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/05/19 20:14:16 UTC
svn commit: r1125032 - in /karaf/cellar/branches/cellar-2.2.x: ./
hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/
hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/
Author: iocanel
Date: Thu May 19 18:14:16 2011
New Revision: 1125032
URL: http://svn.apache.org/viewvc?rev=1125032&view=rev
Log:
Merged from trunk
[KARAF-652] HazelcastServiceFactory now checks for null value the properties passed for building an instance. The test now properly initializes the factory. [from revision 1125012]
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 18:14:16 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1103447,1103456
+/karaf/cellar/trunk:1101991,1103447,1103456,1125012
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java?rev=1125032&r1=1125031&r2=1125032&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java Thu May 19 18:14:16 2011
@@ -11,6 +11,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.karaf.cellar.hazelcast.factory;
import com.hazelcast.config.Config;
@@ -76,7 +90,7 @@ public class HazelcastServiceFactory imp
Boolean updated = Boolean.FALSE;
//We need it to properly instantiate Hazelcast.
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-
+ if (properties != null) {
String newUsername = (String) properties.get("username");
if (username != null && !username.endsWith(newUsername)) {
this.username = newUsername;
@@ -130,6 +144,7 @@ public class HazelcastServiceFactory imp
}
}
}
+ }
if (updated) {
HazelcastInstance instance = lookupInstance();
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java?rev=1125032&r1=1125031&r2=1125032&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java Thu May 19 18:14:16 2011
@@ -32,6 +32,7 @@ public class HazelcastServiceFactoryTest
public void setUp() throws Exception {
factory.setUsername(GroupConfig.DEFAULT_GROUP_NAME);
factory.setPassword(GroupConfig.DEFAULT_GROUP_PASSWORD);
+ factory.createOrUpdate(null);
}
@@ -44,7 +45,6 @@ public class HazelcastServiceFactoryTest
public void testDefaultInstance() throws InterruptedException {
HazelcastInstance defaultInstance = Hazelcast.newHazelcastInstance(null);
HazelcastInstance factoryInstance = factory.buildInstance();
- Thread.sleep(5000);
Assert.assertEquals(true, factoryInstance.getCluster().getMembers().size() >= 2);
}
}