Add a renew session to goss client when fails to publish and re-release

cnf/releaserepo/index.xml.sha

@@ -1 +1 @@
-2f1b4421a414355139f0762e8c7554420544339e17def36ef196e99f842b6ad1
+09d0338768762e1375192d9c6fbb8d7f2afbd12f02bc9f0afb41be31753ebbb8

pnnl.goss.core/core-api.bnd

@@ -1,4 +1,4 @@
 Export-Package: \
 	com.northconcepts.exception,\
 	pnnl.goss.core
-Bundle-Version: 10.0.9.${tstamp}
+Bundle-Version: 10.0.10.${tstamp}

pnnl.goss.core/goss-client.bnd

@@ -1,3 +1,3 @@
 Private-Package:  \
 	pnnl.goss.core.client
-Bundle-Version: 2.0.179.${tstamp}
+Bundle-Version: 2.0.180.${tstamp}

pnnl.goss.core/goss-core-commands.bnd

@@ -1,3 +1,3 @@
 Private-Package:  \
 	pnnl.goss.core.commands
-Bundle-Version: 2.0.119.${tstamp}
+Bundle-Version: 2.0.120.${tstamp}

pnnl.goss.core/goss-core-exceptions.bnd

@@ -1,5 +1,5 @@
 Private-Package:  \
 	pnnl.goss.core.exception
-Bundle-Version: 2.1.1.${tstamp}
+Bundle-Version: 2.1.2.${tstamp}
 Export-Package:  \
 	com.northconcepts.exception

pnnl.goss.core/goss-core-security.bnd

@@ -4,4 +4,4 @@ Private-Package:  \
 Bundle-Activator: pnnl.goss.core.security.impl.Activator
 Export-Package:  \
 	pnnl.goss.core.security
-Bundle-Version: 9.0.3.${tstamp}
+Bundle-Version: 9.0.4.${tstamp}

pnnl.goss.core/goss-core-server-api.bnd

@@ -1,3 +1,3 @@
 Export-Package:  \
 	pnnl.goss.core.server
-Bundle-Version: 3.0.137.${tstamp}
+Bundle-Version: 3.0.138.${tstamp}

pnnl.goss.core/goss-core-server-registry.bnd

@@ -1,4 +1,4 @@
-Bundle-Version: 1.0.184.${tstamp}
+Bundle-Version: 1.0.185.${tstamp}
 Private-Package:  \
 	pnnl.goss.server.registry
 DynamicImport-Package: *

pnnl.goss.core/goss-core-server-web.bnd

@@ -2,7 +2,7 @@ DynamicImport-Package: *
 Private-Package:  \
 	pnnl.goss.core.server.web
 
-Bundle-Version: 1.1.49.${tstamp}
+Bundle-Version: 1.1.50.${tstamp}
 
 # Import webroot folder to path resources/webroot
 Include-Resource: resources/webroot=webroot

pnnl.goss.core/goss-core-server.bnd

@@ -3,4 +3,4 @@ Private-Package:  \
 DynamicImport-Package: *
 #Include-Resource: \
 #	OSGI-INF/blueprint/blueprint.xml=config/blueprint.xml
-Bundle-Version: 2.0.202.${tstamp}
+Bundle-Version: 2.0.203.${tstamp}

pnnl.goss.core/security-jwt.bnd

@@ -1,2 +1,2 @@
 Private-Package: pnnl.goss.core.security.jwt
-Bundle-Version: 1.0.149.${tstamp}
+Bundle-Version: 1.0.150.${tstamp}

pnnl.goss.core/security-ldap.bnd

@@ -1,3 +1,3 @@
 Private-Package:  \
 	pnnl.goss.core.security.ldap
-Bundle-Version: 1.0.134.${tstamp}
+Bundle-Version: 1.0.135.${tstamp}

pnnl.goss.core/security-propertyfile.bnd

@@ -1,3 +1,3 @@
 Private-Package:  \
 	pnnl.goss.core.security.propertyfile
-Bundle-Version: 2.0.145.${tstamp}
+Bundle-Version: 2.0.146.${tstamp}

pnnl.goss.core/security-system.bnd

@@ -1,2 +1,2 @@
 Private-Package: pnnl.goss.core.security.system
-Bundle-Version: 2.0.144.${tstamp}
+Bundle-Version: 2.0.145.${tstamp}

pnnl.goss.core/src/pnnl/goss/core/client/GossClient.java

@@ -490,10 +490,46 @@ public void publish(String topic, Serializable data) throws SystemException {
 
 		} catch (JMSException e) {
 			log.error("publish error", e);
+
+			try{
+				//Ran into error publishing, reset the session and try again
+				log.info("Renewing session");
+				session = null;
+				getSession();
+				Destination destination = getDestination(topic, connection, getSession());
+
+				if (data instanceof String){
+					clientPublisher.publish(destination, data);
+				}
+				else {
+					Gson gson = new Gson();
+					clientPublisher.publish(destination, gson.toJson(data));
+				}
+			} catch (Exception e2) {
+				log.error("Failed second attempt to publish ",e2);
+				e.printStackTrace();
+			}
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
-			throw SystemException.wrap(e);
+			try{
+				//Ran into error publishing, reset the session and try again
+				log.info("Renewing session");
+				session = null;
+				getSession();
+				Destination destination = getDestination(topic, connection, getSession());
+
+				if (data instanceof String){
+					clientPublisher.publish(destination, data);
+				}
+				else {
+					Gson gson = new Gson();
+					clientPublisher.publish(destination, gson.toJson(data));
+				}
+			} catch (Exception e2) {
+				log.error("Failed second attempt to publish ",e2);
+				e.printStackTrace();
+				throw SystemException.wrap(e);
+			}
 		}
 	}
 
@@ -504,6 +540,7 @@ public void publish(Destination destination, Serializable data) throws SystemExc
 			if (data == null)
 				throw new NullPointerException("data cannot be null");
 
+
 			if (data instanceof String){
 				clientPublisher.publish(destination, data);
 			}
@@ -514,10 +551,45 @@ public void publish(Destination destination, Serializable data) throws SystemExc
 
 		} catch (JMSException e) {
 			log.error("publish error", e);
+
+			try{
+				//Ran into error publishing, reset the session and try again
+				log.info("Renewing session");
+				session = null;
+				getSession();
+				if (data instanceof String){
+					clientPublisher.publish(destination, data);
+				}
+				else {
+					Gson gson = new Gson();
+					clientPublisher.publish(destination, gson.toJson(data));
+				}
+			} catch (Exception e2) {
+				log.error("Failed second attempt to publish ",e2);
+				e.printStackTrace();
+			}
+
+
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
-			throw SystemException.wrap(e);
+			try{
+				//Ran into error publishing, reset the session and try again
+				log.info("Renewing session");
+				getSession();
+				session = null;
+				if (data instanceof String){
+					clientPublisher.publish(destination, data);
+				}
+				else {
+					Gson gson = new Gson();
+					clientPublisher.publish(destination, gson.toJson(data));
+				}
+			} catch (Exception e2) {
+				log.error("Failed second attempt to publish ",e2);
+				e.printStackTrace();
+				throw SystemException.wrap(e);
+			}
+
 		}
 	}