ATS-12 re-suse cleint if present, shutdown instance on destroy()

src/main/java/org/appng/tomcat/session/hazelcast/HazelcastPersistentManager.java

@@ -28,6 +28,12 @@ public class HazelcastPersistentManager extends PersistentManagerBase {
 
 	protected void destroyInternal() throws LifecycleException {
 		super.destroyInternal();
+		getStore().destroy();
+	}
+
+	@Override
+	public HazelcastStore getStore() {
+		return (HazelcastStore) super.getStore();
 	}
 
 	@Override

src/main/java/org/appng/tomcat/session/hazelcast/HazelcastStore.java

@@ -117,8 +117,12 @@ protected void initInternal() {
 			for (String address : addressArr) {
 				clientConfig.getNetworkConfig().addAddress(address.trim());
 			}
-			instance = HazelcastClient.newHazelcastClient(clientConfig);
-			break;
+			instance = HazelcastClient.getHazelcastClientByName(instanceName);
+			if (null == instance) {
+				instance = HazelcastClient.newHazelcastClient(clientConfig);
+			}
+			log.info(String.format("Using client, connecting to %s", clientConfig.getNetworkConfig().getAddresses()));
+			return;
 
 		case "tcp":
 			joinConfig.getTcpIpConfig().setEnabled(true);
@@ -141,6 +145,12 @@ protected void initInternal() {
 		}
 		log.info(String.format("Using instance %s", instance));
 	}
+
+	@Override
+	protected void destroyInternal() {
+		log.info(String.format("Shutting down instance %s", instance));
+		instance.shutdown();
+	}
 
 	public void save(Session session) throws IOException {
 		try (ByteArrayOutputStream bos = new ByteArrayOutputStream();