Make 'eval' work in callback function (#94)

* Mechanical code checks

* File is nor required anymore

* Bump version

* Update to activemq 5.14.1

* Extended logging : write stack traces where potentially needed

* Fix typo

* UpdUpdate to activemq 5.14.1

* Final fix for #93

Author: dizzzz

build.properties

@@ -3,7 +3,7 @@ exist.dir=../exist/
 
 # Extension details
 module.name=messaging-replication
-module.version=0.9.12
+module.version=0.9.13
 module.title=Messaging and Replication
 
 # Build instructions

config/library/exist.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <package xmlns="http://exist-db.org/ns/expath-pkg">
     <jar>exist-messaging-replication-@[email protected]</jar>
-    <jar>activemq-client-5.14.0.jar</jar>
-    <jar>activemq-jms-pool-5.14.0.jar</jar>
-    <jar>activemq-pool-5.14.0.jar</jar>
+    <jar>activemq-client-5.14.1.jar</jar>
+    <jar>activemq-jms-pool-5.14.1.jar</jar>
+    <jar>activemq-pool-5.14.1.jar</jar>
     <jar>geronimo-j2ee-management_1.1_spec-1.0.1.jar</jar>
     <jar>geronimo-jms_1.1_spec-1.1.1.jar</jar>
     <jar>hawtbuf-1.11.jar</jar>

ivy.xml

@@ -7,7 +7,7 @@
     <dependencies>
 
         <!-- ActiveMQ client -->
-        <dependency org="org.apache.activemq" name="activemq-client" rev="5.14.0" conf="*->*">
+        <dependency org="org.apache.activemq" name="activemq-client" rev="5.14.1" conf="*->*">
             <exclude module="ant"/>
             <exclude module="slf4j-api"/>
             <exclude module="commons-net"/>
@@ -19,10 +19,10 @@
         </dependency>
 
         <!-- ActiveMQ pool -->
-        <dependency org="org.apache.activemq" name="activemq-pool" rev="5.14.0" conf="*->*" transitive="false"/>
+        <dependency org="org.apache.activemq" name="activemq-pool" rev="5.14.1" conf="*->*" transitive="false"/>
 
         <!-- ActiveMQ jms pool -->
-        <dependency org="org.apache.activemq" name="activemq-jms-pool" rev="5.14.0" conf="*->*" transitive="false"/>
+        <dependency org="org.apache.activemq" name="activemq-jms-pool" rev="5.14.1" conf="*->*" transitive="false"/>
 
         <!-- Additional dependancy -->
         <dependency org="org.apache.commons" name="commons-pool2" rev="2.4.2" conf="*->*" transitive="false"/>

java/src/org/exist/jms/messaging/MessagingJmsListener.java

@@ -68,7 +68,7 @@ public class MessagingJmsListener extends eXistMessagingListener {
     private Subject subject;
     private Report report = null;
 
-//    private Session session;
+    //    private Session session;
     private int receiverID = -1;
 
 
@@ -83,7 +83,7 @@ public class MessagingJmsListener extends eXistMessagingListener {
     public MessagingJmsListener(final Subject subject, final FunctionReference functionReference, final Sequence functionParams, final XQueryContext xqueryContext) {
         super();
         this.functionReference = functionReference;
-        this.xqueryContext = xqueryContext;
+        this.xqueryContext = xqueryContext.copyContext();
         this.functionParams = functionParams;
         this.report = getReport();
         this.subject = subject;
@@ -93,7 +93,10 @@ public MessagingJmsListener(final Subject subject, final FunctionReference funct
     public void onMessage(final Message msg) {
 
         // Make a copy, just in case
-        functionReference.setContext(xqueryContext.copyContext());
+        XQueryContext copyContext = xqueryContext.copyContext();
+
+        // Set new context to function reference
+        functionReference.setContext(copyContext);
 
         receiverID = getReceiverID();
 
@@ -153,7 +156,7 @@ public void onMessage(final Message msg) {
 
                 // Done
                 if (LOG.isDebugEnabled()) {
-                    LOG.debug("Reciever={} : Function returned %s", receiverID, result.getStringValue());
+                    LOG.debug("Receiver={} : Function returned %s", receiverID, result.getStringValue());
                 }
 
                 // Acknowledge processing
@@ -167,6 +170,9 @@ public void onMessage(final Message msg) {
             }
 
         } catch (final Throwable ex) {
+
+            LOG.error(ex.getMessage(), ex);
+
             report.addListenerError(ex);
             LOG.error(String.format("%s (Receiver=%s)", ex.getMessage(), receiverID), ex);
 
@@ -193,7 +199,7 @@ public void onMessage(final Message msg) {
     /**
      * Convert JMS message into a sequence of data.
      *
-     * @param msg       The JMS message object
+     * @param msg The JMS message object
      * @return Sequence representing the JMS message
      * @throws IOException    An internal IO error occurred.
      * @throws XPathException An eXist-db object could not be  handled.

java/src/org/exist/jms/replication/publish/JMSMessageSender.java

@@ -48,8 +48,8 @@ public class JMSMessageSender implements MessageSender {
     /**
      * Constructor
      *
-     * @param parameters Set of (Key,value) parameters for setting JMS routing
-     *                   instructions, like java.naming.* , destination and connection factory.
+     * @param params Set of (Key,value) parameters for setting JMS routing
+     *               instructions, like java.naming.* , destination and connection factory.
      */
     JMSMessageSender(final Map<String, List<?>> params) {
         parameters.setMultiValueParameters(params);

java/src/org/exist/jms/replication/shared/MessageHelper.java

@@ -76,10 +76,10 @@ public class MessageHelper {
     /**
      * Serialize document to byte array as gzipped document.
      *
-     * @param broker
-     * @param document
-     * @return document as bytes
-     * @throws IOException
+     * @param broker   The broker
+     * @param document Document to compress
+     * @return document as array of bytes
+     * @throws IOException When the
      */
     public static byte[] gzipSerialize(final DBBroker broker, final DocumentImpl document) throws IOException {
 
@@ -114,7 +114,7 @@ public static byte[] gzipSerialize(final DBBroker broker, final DocumentImpl doc
             } catch (final Throwable e) {
                 payload = new byte[0];
                 System.gc(); // recover from out of memory exception
-                LOG.error(e);
+                LOG.error(e.getMessage(), e);
                 throw new IOException(String.format("Error while serializing XML document: %s", e.getMessage()), e);
             }
 
@@ -140,7 +140,7 @@ public static byte[] gzipSerialize(final DBBroker broker, final DocumentImpl doc
             } catch (final Throwable e) {
                 payload = new byte[0];
                 System.gc(); // recover from out of memory exception
-                LOG.error(e);
+                LOG.error(e.getMessage(), e);
                 throw new IOException(String.format("Error while serializing binary document: %s", e.getMessage()), e);
             }
         }

java/src/org/exist/jms/replication/shared/ReplicationGuard.java

@@ -27,9 +27,8 @@
  */
 public class ReplicationGuard {
 
-    private static volatile ReplicationGuard instance = null;
     private final static Logger LOGGER = LogManager.getLogger(ReplicationGuard.class);
-
+    private static volatile ReplicationGuard instance = null;
     boolean replicationEnabled = true;
 
     private ReplicationGuard() {
@@ -51,14 +50,14 @@ public static ReplicationGuard getInstance() {
 
     }
 
-    public void setReplicationEnabled(boolean newStatus){
+    public boolean getReplicationEnabled() {
+        return this.replicationEnabled;
+    }
 
-        LOGGER.info("Replication is switched {}", newStatus ? "ON" : "OFF");
+    public void setReplicationEnabled(final boolean newStatus) {
 
-        this.replicationEnabled=newStatus;
-    }
+        LOGGER.info("Replication is switched {}", newStatus ? "ON" : "OFF");
 
-    public boolean getReplicationEnabled(){
-        return this.replicationEnabled;
+        this.replicationEnabled = newStatus;
     }
 }

java/src/org/exist/jms/replication/subscribe/ReplicationJmsListener.java

@@ -24,7 +24,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.exist.EXistException;
 import org.exist.collections.Collection;
 import org.exist.collections.IndexInfo;
 import org.exist.dom.persistent.DocumentImpl;
@@ -33,9 +32,6 @@
 import org.exist.security.Account;
 import org.exist.security.Group;
 import org.exist.security.Permission;
-import org.exist.security.PermissionDeniedException;
-import org.exist.security.internal.aider.GroupAider;
-import org.exist.security.internal.aider.UserAider;
 import org.exist.storage.BrokerPool;
 import org.exist.storage.DBBroker;
 import org.exist.storage.lock.Lock;
@@ -347,7 +343,7 @@ private void createUpdateDocument(final eXistMessage em) {
             collection = getOrCreateCollection(colURI, userName, groupName, Optional.of(Permission.DEFAULT_COLLECTION_PERM), null);
 
         } catch (final MessageReceiveException e) {
-            LOG.error(e.getMessage());
+            LOG.error(e.getMessage(), e);
             throw e;
         } catch (final Throwable t) {
             if (LOG.isDebugEnabled()) {
@@ -534,7 +530,7 @@ private void updateMetadataDocument(final eXistMessage em) {
             txn.commit();
 
         } catch (final Throwable e) {
-            LOG.error(e);
+            LOG.error(e.getMessage(), e);
             throw new MessageReceiveException(e.getMessage(), e);
 
         } finally {
@@ -795,7 +791,7 @@ private void relocateDocument(final eXistMessage em, final boolean keepDocument)
             txnManager.commit(txn);
 
         } catch (final Throwable e) {
-            LOG.error(e);
+            LOG.error(e.getMessage(), e);
             throw new MessageReceiveException(e.getMessage(), e);
 
         } finally {
@@ -847,7 +843,7 @@ private void relocateCollection(final eXistMessage em, final boolean keepCollect
             txn.commit();
 
         } catch (final Throwable e) {
-            LOG.error(e);
+            LOG.error(e.getMessage(), e);
             throw new MessageReceiveException(e.getMessage());
 
         } finally {
@@ -911,7 +907,7 @@ private void updateMetadataCollection(final eXistMessage em) {
             txn.commit();
 
         } catch (final Throwable e) {
-            LOG.error(e);
+            LOG.error(e.getMessage(), e);
             throw new MessageReceiveException(e.getMessage());
 
         } finally {

java/src/org/exist/jms/replication/subscribe/UserGroupHelper.java

@@ -174,7 +174,7 @@ public NodeImpl send(final JmsConfiguration jmsConfig, final JmsMessagePropertie
             return createReport(message, producer, jmsConfig);
 
         } catch (final Throwable ex) {
-            LOG.error(ex);
+            LOG.error(ex.getMessage(), ex);
             throw new XPathException(ex.getMessage());
 
         } finally {
@@ -197,7 +197,7 @@ private ConnectionFactory getConnectionFactoryInstance(final javax.naming.Contex
         final ConnectionFactory retVal;
 
         // Use pooling when
-        final String poolValue = jmsConfig.getProperty(EXIST_CONNECTION_POOL,"activemq");
+        final String poolValue = jmsConfig.getProperty(EXIST_CONNECTION_POOL, "activemq");
         if (StringUtils.isNotBlank(poolValue)) {
 
             // Get URL to broker