commit 33a049748b974e66d68caedb68ebf0b637869457
author Yuta HIGUCHI <y-higuchi@onlab.us> Tue Jun 03 13:00:15 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Fri Jun 20 10:45:44 2014 -0700
tree d817b0207b8cb71fe2aea6110719bae3d66dcc4c
parent c25861af883aebb695066d1da1c33e60b8776115

Update to Hazelcast 3.2.3

- Fix compilation, if you need to use Hazelcast 3.2.3
- Workaround for issue with recent Hazelcast version + PowerMock
- Unexpected exception should fail the test instead

Change-Id: I2ecf1deb3e38be98837e41b8df57b680ad2445a1

src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java

diff --git a/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java b/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
index 04957f2..1b3167d 100644
--- a/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
@@ -725,4 +725,15 @@
     public long getArpCleaningTimerPeriod() {
         return arpCleaningTimerPeriodConfig;
     }
+
+    /**
+     * Replaces the internal ArpCache.
+     *
+     * @param cache ArpCache instance
+     *
+     * @exclude Backdoor for unit testing purpose only, do not use.
+     */
+    void debugReplaceArpCache(final ArpCache cache) {
+        this.arpCache = cache;
+    }
 }

src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java

diff --git a/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java b/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java
index dc9d2f8..e568e09 100644
--- a/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java
+++ b/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java
@@ -130,13 +130,13 @@
             final int port = baseHzConfig.getNetworkConfig().getPort();
 
             String server = System.getProperty("net.onrc.onos.core.datastore.hazelcast.client.server", "localhost");
-            clientConfig.addAddress(server + ":" + port);
+            clientConfig.getNetworkConfig().addAddress(server + ":" + port);
 
             // client mode connection limit.
             // set to 0 for fast fall back to Instance mode.
             String sAttempts = System.getProperty("net.onrc.onos.core.datastore.hazelcast.client.attemptLimit");
             if (sAttempts != null) {
-                clientConfig.setConnectionAttemptLimit(Integer.parseInt(sAttempts));
+                clientConfig.getNetworkConfig().setConnectionAttemptLimit(Integer.parseInt(sAttempts));
             }
 
             // copy group config from base Hazelcast configuration
@@ -148,7 +148,7 @@
 
             registerSerializer(clientConfig.getSerializationConfig());
 
-            log.info("Starting Hazelcast datastore client for [{}]", clientConfig.getAddressList());
+            log.info("Starting Hazelcast datastore client for [{}]", clientConfig.getNetworkConfig().getAddresses());
 
             try {
                 instance = HazelcastClient.newHazelcastClient(clientConfig);