Changeset 713

Timestamp:

04/28/11 18:53:39 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor

Files:

• event/expansion/AttributeAssociationDefinition.java (modified) (6 diffs)
• event/expansion/AttributeAssociationEngine.java (modified) (2 diffs)
• event/expansion/connector/DataConnector.java (modified) (1 diff)
• event/expansion/connector/LdapDataConnector.java (modified) (10 diffs)
• remoting/client/ReleaseFailureException.java (modified) (1 diff)
• remoting/client/sei/impl/CxfServiceEndpointClient.java (modified) (2 diffs)
• store/AsynchronousEntryStoragePipeline.java (modified) (3 diffs)
• store/StorageEngine.java (modified) (4 diffs)
• store/TransactionInProgressException.java (added)
• store/impl/PersistantEntryHandler.java (modified) (1 diff)

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/AttributeAssociationDefinition.java

@@ -5 +5 @@
 
 import java.util.List;
-
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import uk.ac.cardiff.model.event.Event;
 import uk.ac.cardiff.raptor.event.expansion.connector.AttributeAssociationException;
+import uk.ac.cardiff.raptor.event.expansion.connector.DataConnector;
+import uk.ac.cardiff.raptor.runtimeutils.ReflectionHelper;
 
 /**
@@ -14 +21 @@
 public class AttributeAssociationDefinition {
 
+    /** Class logger. */
+    private final Logger log = LoggerFactory.getLogger(AttributeAssociationDefinition.class);
+
+    /** Human readable name for this definition*/
+    private String definiationName;
+
     /** The name of the field the subject's principal should be extracted from*/
     private String subjectPrincipalField;
@@ -19 +32 @@
     private List<AttributeLookup> lookupAttributes;
 
+    /** Whether to apply the attribute association*/
+    private boolean enabled;
+
     /** The class type that these attribute definitions are attached to*/
-    private Class internalModelClass;
-
+    private Class<?> classToAdd;
+
+    /** The class type that this attribute association is applicable for */
+    private String associateWithClass;
+
+    /** The data connector used to acquire the attributes*/
+    private DataConnector dataConnector;
+
+    /** The ldap search filter template*/
+    private String searchFilterTemplate;
 
     /**
@@ -35 +59 @@
     }
 
+    public void initialise(){
+        dataConnector.initialise();
+
+    }
 
 
@@ -50 +78 @@
 
 
+    private void populate(Map<String,String> attributes, Event event) throws InstantiationException, IllegalAccessException{
+
+        Object classToPopulate = getClassToAdd().newInstance();
+
+        for (Map.Entry<String,String> entry : attributes.entrySet()){
+            String attributeSourceName = entry.getKey();
+            String attributeValue = entry.getValue();
+            log.trace("source [{}], value [{}]",attributeSourceName,attributeValue);
+            try{
+                String internalFieldName = getInternalAttributeName(attributeSourceName);
+                ReflectionHelper.setValueOnObject(internalFieldName, attributeValue, classToPopulate);
+            }
+            catch(AttributeAssociationException e){
+                log.warn("Error trying to populate internal model. {}",e.getMessage());
+            }
+        }
+
+        //now attach the object where appropriate on the current <code>Event</code> object
+        ReflectionHelper.attachObjectTo(classToPopulate,event);
+
+       // log.debug("{}",event);
+    }
+
+    /**
+     * @param event
+     */
+    public boolean associate(Event event) {
+       // log.debug("{},v {}",event.getClass().getCanonicalName(),associateWithClass.getClass().getCanonicalName());
+        if (!event.getClass().getCanonicalName().equals(associateWithClass)){
+            return false;
+        }
+
+        Object principalObject = ReflectionHelper.getValueFromObject(getSubjectPrincipalField(), event);
+        String principal = null;
+        if (principalObject instanceof String){
+            principal = (String)principalObject;
+        }
+        if (principal!=null){
+            try {
+                 dataConnector.setReturnAttributes(getSourceAttributesAsArray());
+                 dataConnector.setSearchFilterTemplate(searchFilterTemplate);
+                 Map<String, String> attributes = dataConnector.lookup(principal);
+                 populate(attributes,event);
+
+                 return true;
+            } catch (AttributeAssociationException e) {
+                log.error("Association error for principal [{}]",principal,e);
+            } catch (InstantiationException e) {
+                log.warn("Could not populate event [{}], {}",event,e.getMessage());
+            } catch (IllegalAccessException e) {
+                log.warn("Could not populate event [{}], {}",event,e.getMessage());
+            }
+        }
+        return false;
+
+    }
+
+
+
     /**
      * @param subjectPrincipalField the subjectPrincipalField to set
@@ -78 +165 @@
     }
 
-
-
-    /**
-     * @param internalModelClass the internalModelClass to set
-     */
-    public void setInternalModelClass(Class internalModelClass) {
-        this.internalModelClass = internalModelClass;
-    }
-
-
-
-    /**
-     * @return the internalModelClass
-     */
-    public Class getInternalModelClass() {
-        return internalModelClass;
-    }
-
-
+    /**
+     * @param enabled the enabled to set
+     */
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+
+
+    /**
+     * @return the enabled
+     */
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+
+
+    /**
+     * @param dataConnector the dataConnector to set
+     */
+    public void setDataConnector(DataConnector dataConnector) {
+        this.dataConnector = dataConnector;
+    }
+
+
+
+    /**
+     * @return the dataConnector
+     */
+    public DataConnector getDataConnector() {
+        return dataConnector;
+    }
+
+
+
+    /**
+     * @param searchFilterTemplate the searchFilterTemplate to set
+     */
+    public void setSearchFilterTemplate(String searchFilterTemplate) {
+        this.searchFilterTemplate = searchFilterTemplate;
+    }
+
+
+
+    /**
+     * @return the searchFilterTemplate
+     */
+    public String getSearchFilterTemplate() {
+        return searchFilterTemplate;
+    }
+
+
+
+    /**
+     * @param definiationName the definiationName to set
+     */
+    public void setDefiniationName(String definiationName) {
+        this.definiationName = definiationName;
+    }
+
+
+
+    /**
+     * @return the definiationName
+     */
+    public String getDefiniationName() {
+        return definiationName;
+    }
+
+    /**
+     * @param classToAdd the classToAdd to set
+     */
+    public void setClassToAdd(Class<?> classToAdd) {
+        this.classToAdd = classToAdd;
+    }
+
+    /**
+     * @return the classToAdd
+     */
+    public Class<?> getClassToAdd() {
+        return classToAdd;
+    }
+
+    /**
+     * @param associateWithClass the associateWithClass to set
+     */
+    public void setAssociateWithClass(String associateWithClass) {
+        this.associateWithClass = associateWithClass;
+    }
+
+    /**
+     * @return the associateWithClass
+     */
+    public String getAssociateWithClass() {
+        return associateWithClass;
+    }
 
 

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/AttributeAssociationEngine.java

@@ -41 +41 @@
 
     /** Defines which attributes to add, and what principal to attach to*/
-    private AttributeAssociationDefinition attributeAssociationDefinition;
-
-    private DataConnector dataConnector;
+    private List<AttributeAssociationDefinition> attributeAssociationDefinitions;
 
     /**
@@ -52 +50 @@
     }
 
-
     /**
      * Gets associated attributes for the given ...
      */
     public void associateAttributes(List<Event> events) throws AttributeAssociationException{
-        log.info("Has Attribute Definition [{}]",attributeAssociationDefinition!=null);
-        if (attributeAssociationDefinition==null){
-            throw new AttributeAssociationException("Attribute association not specified");
+
+        for (AttributeAssociationDefinition attributeAssociationDefinition: attributeAssociationDefinitions){
+            log.info("Attribute Association Definition [{}], is enabled [{}]",attributeAssociationDefinition.getDefiniationName(), attributeAssociationDefinition.isEnabled());
+
+            if (!attributeAssociationDefinition.isEnabled()){
+                continue;
+            }
+
+            int attached=0;
+            int noPrincipal=0;
+            int current=0;
+            final int noOfEvents = events.size();
+            for (Event event : events){
+                printProgressPosition(current, noOfEvents);
+                boolean associated = attributeAssociationDefinition.associate(event);
+                if (associated){
+                    attached++;
+                }
+                else{
+                    noPrincipal++;
+                }
+                current++;
+            }
+            log.info("Attribute Association Definition {} finished, associated information to {} events, where {} events where not of a valid class type or did not have the correct principal",
+                    new Object[]{attributeAssociationDefinition.getDefiniationName(),attached,noPrincipal});
         }
-
-        log.info("Attribute Association started for principal field [{}]",attributeAssociationDefinition.getSubjectPrincipalField());
-
-        int attached=0;
-        int noPrincipal=0;
-        for (Event event : events){
-            Object principalObject = ReflectionHelper.getValueFromObject(attributeAssociationDefinition.getSubjectPrincipalField(), event);
-            String principal = null;
-            if (principalObject instanceof String){
-                principal = (String)principalObject;
-            }
-            if (principal!=null){
-                try {
-                    dataConnector.setReturnAttributes(attributeAssociationDefinition.getSourceAttributesAsArray());
-                    Map<String, String> attributes = dataConnector.lookup(principal);
-                    populate(attributes,event);
-                    attached++;
-                } catch (AttributeAssociationException e) {
-                    log.error("Association error for principal [{}]",principal,e);
-                } catch (InstantiationException e) {
-                    log.warn("Could not populate event [{}], {}",event,e.getMessage());
-                } catch (IllegalAccessException e) {
-                    log.warn("Could not populate event [{}], {}",event,e.getMessage());
-                }
-            }
-            else{
-                noPrincipal++;
-            }
-        }
-        log.info("Associated information to {} events, where {} events did not have a valid principal",attached,noPrincipal);
-    }
-
-    private void populate(Map<String,String> attributes, Event event) throws InstantiationException, IllegalAccessException{
-
-        Object classToPopulate = attributeAssociationDefinition.getInternalModelClass().newInstance();
-
-        for (Map.Entry<String,String> entry : attributes.entrySet()){
-            String attributeSourceName = entry.getKey();
-            String attributeValue = entry.getValue();
-            log.trace("source [{}], value [{}]",attributeSourceName,attributeValue);
-            try{
-                String internalFieldName = attributeAssociationDefinition.getInternalAttributeName(attributeSourceName);
-                ReflectionHelper.setValueOnObject(internalFieldName, attributeValue, classToPopulate);
-            }
-            catch(AttributeAssociationException e){
-                log.warn("Error trying to populate internal model. {}",e.getMessage());
-            }
-        }
-
-        //now attach the object where approppriate on the current <code>Event</code> object
-        ReflectionHelper.attachObjectTo(classToPopulate,event);
-        
-        log.debug("{}",event);
-    }
-
-    /**
-     * @param attributeAssociationDefinition the attributeAssociationDefinition to set
-     */
-    public void setAttributeAssociationDefinition(AttributeAssociationDefinition attributeAssociationDefinition) {
-        this.attributeAssociationDefinition = attributeAssociationDefinition;
-    }
-
-    /**
-     * @return the attributeAssociationDefinition
-     */
-    public AttributeAssociationDefinition getAttributeAssociationDefinition() {
-        return attributeAssociationDefinition;
     }
 
 
     /**
-     * @param dataConnector the dataConnector to set
+     * Prints, as a percentage of the total, the event currently being processed.
+     *
+     * @param lineCount
+     * @param totalNoLines
      */
-    public void setDataConnector(DataConnector dataConnector) {
-        this.dataConnector = dataConnector;
-        dataConnector.initialise();
+    private void printProgressPosition(int lineCount, int totalNoLines) {
+            double linePercentage = (((double) lineCount / (double) totalNoLines) * 100);
+            if (linePercentage % 25 >= 0 && linePercentage % 25 <= 0.003)
+                    log.debug("Attribute Association, Complete {}%", linePercentage);
     }
 
+    /**
+     * Also initialises the definitions
+     *
+     * @param attributeAssociationDefinitions the attributeAssociationDefinitions to set
+     */
+    public void setAttributeAssociationDefinitions(List<AttributeAssociationDefinition> attributeAssociationDefinitions) {
+        this.attributeAssociationDefinitions = attributeAssociationDefinitions;
+        for (AttributeAssociationDefinition definition : attributeAssociationDefinitions){
+              definition.initialise();
+        }
+    }
 
     /**
-     * @return the dataConnector
+     * @return the attributeAssociationDefinitions
      */
-    public DataConnector getDataConnector() {
-        return dataConnector;
+    public List<AttributeAssociationDefinition> getAttributeAssociationDefinitions() {
+        return attributeAssociationDefinitions;
     }
 
 
 
+
 }

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/connector/DataConnector.java

@@ -18 +18 @@
     public void setReturnAttributes(String[] s);
 
+    public void setSearchFilterTemplate(String searchFilterTemplate);
+
 }

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/event/expansion/connector/LdapDataConnector.java

@@ -42 +42 @@
 import net.shibboleth.idp.attribute.resolver.BaseDataConnector;
 
+import org.joda.time.DateTime;
 import org.opensaml.xml.security.x509.X509Credential;
 import org.opensaml.xml.util.DatatypeHelper;
@@ -48 +49 @@
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
+
+import uk.ac.cardiff.raptor.event.expansion.AttributeLookup;
 
 import edu.vt.middleware.ldap.Ldap;
@@ -129 +132 @@
     private String searchFilterTemplate;
 
+    /** How long the cache remains valid before it is cleared */
+    private long cacheTimeoutMs;
+
+    /** The time at which the cache was last reset*/
+    private long cacheResetTimeMs;
 
     /**
@@ -141 +149 @@
      */
     public void initialise() {
-        initialized = true;
-        initializeLdapPool();
-        initializeCache();
+        if (!initialized){
+            initialized = true;
+            initializeLdapPool();
+            initializeCache();
+        }
     }
 
@@ -163 +173 @@
         if (cacheResults && initialized) {
             cache = new HashMap<String, Map<String, Map<String, String>>>();
+            cacheResetTimeMs = System.currentTimeMillis();
         }
     }
@@ -172 +183 @@
         if (cacheResults && initialized) {
             cache.clear();
+            cacheResetTimeMs = System.currentTimeMillis();
         }
     }
@@ -289 +301 @@
     public void setSslSocketFactory(SSLSocketFactory sf) {
         ldapConfig.setSslSocketFactory(sf);
-        clearCache();
-        initializeLdapPool();
     }
 
@@ -676 +686 @@
     }
 
+    private void checkCacheValidity(){
+        if (cacheTimeoutMs==0 || !cacheResults){
+            return;
+        }
+        long currentTimeMillis = System.currentTimeMillis();
+        boolean shouldReset  = (currentTimeMillis - cacheResetTimeMs) > cacheTimeoutMs;
+        if (shouldReset){
+            log.info("Ldap cache was cleared, timeout reached");
+            clearCache();
+        }
+    }
+
 
     /** {@inheritDoc} */
     public Map<String, String> lookup(String principal) throws AttributeAssociationException {
+
         String searchFilter = searchFilterTemplate.replace("[principal]",principal);
-
         searchFilter = searchFilter.trim();
-        log.debug("Search filter: {}", searchFilter);
+        //log.debug("Search: "+searchFilter);
+        //check if cache is still valid
+        checkCacheValidity();
 
         // create Attribute objects to return
@@ -688 +712 @@
 
         // check for cached data
-//        if (cacheResults) {
-//            log.debug("Checking cache for search results");
-//            attributes = getCachedAttributes(resolutionContext, searchFilter);
-//            if (attributes != null && log.isDebugEnabled()) {
-//                log.debug("Returning attributes from cache");
-//            }
-//        }
+        if (cacheResults) {
+            attributes = getCachedAttributes(principal, searchFilter);
+        }
 
         // results not found in the cache
         if (attributes == null) {
-            //log.debug("Retrieving attributes from LDAP");
             Iterator<SearchResult> results = searchLdap(searchFilter);
             // check for empty result set
             if (noResultsIsError && !results.hasNext()) {
-                throw new AttributeAssociationException("No LDAP entry found for scmps2");
+                throw new AttributeAssociationException("No LDAP entry found for "+principal);
             }
             // build resolved attributes from LDAP attributes
             attributes = buildBaseAttributes(results);
-//            if (cacheResults && attributes != null) {
-//                setCachedAttributes(resolutionContext, searchFilter, attributes);
-//                log.debug("Stored results in the cache");
-//            }
+            if (cacheResults && attributes != null) {
+                setCachedAttributes(principal, searchFilter, attributes);
+                //log.debug("Stored results in the cache");
+            }
         }
 
@@ -866 +885 @@
 
 
-//    /**
-//     * This stores the supplied attributes in the cache.
-//     *
-//     * @param resolutionContext <code>ResolutionContext</code>
-//     * @param searchFiler the searchFilter that produced the attributes
-//     * @param attributes <code>Map</code> of attribute ids to attributes
-//     */
-//    protected void setCachedAttributes(AttributeResolutionContext resolutionContext, String searchFiler,
-//            Map<String, Attribute> attributes) {
-//        Map<String, Map<String, Attribute>> results = null;
-//        String principal = resolutionContext.getAttributeRequestContext().getPrincipalName();
-//        if (cache.containsKey(principal)) {
-//            results = cache.get(principal);
-//        } else {
-//            results = new HashMap<String, Map<String, Attribute>>();
-//            cache.put(principal, results);
-//        }
-//        results.put(searchFiler, attributes);
-//    }
-
-//    /**
-//     * This retrieves any cached attributes for the supplied resolution context. Returns null if nothing is cached.
-//     *
-//     * @param resolutionContext <code>ResolutionContext</code>
-//     * @param searchFilter the search filter the produced the attributes
-//     *
-//     * @return <code>Map</code> of attributes ids to attributes
-//     */
-//    protected Map<String, Attribute> getCachedAttributes(AttributeResolutionContext resolutionContext,
-//            String searchFilter) {
-//        Map<String, Attribute> attributes = null;
-//        if (cacheResults) {
-//            String principal = resolutionContext.getAttributeRequestContext().getPrincipalName();
-//            if (cache.containsKey(principal)) {
-//                Map<String, Map<String, Attribute>> results = cache.get(principal);
-//                attributes = results.get(searchFilter);
-//            }
-//        }
-//        return attributes;
-//    }
+    /**
+     * This stores the supplied attributes in the cache.
+     *
+     * @param principalName
+     * @param searchFiler the searchFilter that produced the attributes
+     * @param attributes <code>Map</code> of attribute ids to attributes
+     */
+    protected void setCachedAttributes(String principalName, String searchFiler, Map<String, String> attributes) {
+        Map<String, Map<String, String>> results = null;
+        if (cache.containsKey(principalName)) {
+            results = cache.get(principalName);
+        } else {
+            results = new HashMap<String, Map<String, String>>();
+            cache.put(principalName, results);
+        }
+        results.put(searchFiler, attributes);
+    }
+
+    /**
+     * This retrieves any cached attributes for the supplied resolution context. Returns null if nothing is cached.
+     *
+     * @param principalName
+     * @param searchFilter the search filter the produced the attributes
+     *
+     * @return <code>Map</code> of attributes ids to attributes
+     */
+    protected Map<String, String> getCachedAttributes(String principalName,
+            String searchFilter) {
+        Map<String, String> attributes = null;
+        if (cacheResults) {
+            if (cache.containsKey(principalName)) {
+                Map<String, Map<String, String>> results = cache.get(principalName);
+                attributes = results.get(searchFilter);
+            }
+        }
+        return attributes;
+    }
+
+    /**
+     * @param cacheTimeoutMs the cacheTimeoutMs to set
+     */
+    public void setCacheTimeoutMs(long cacheTimeoutMs) {
+        this.cacheTimeoutMs = cacheTimeoutMs;
+    }
+
+    /**
+     * @return the cacheTimeoutMs
+     */
+    public long getCacheTimeoutMs() {
+        return cacheTimeoutMs;
+    }
 
 

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/ReleaseFailureException.java

@@ -22 +22 @@
          */
         private static final long serialVersionUID = -1091443418866759066L;
-        
-        public ReleaseFailureException (String message, Exception e){
-                super (message,e);
+
+        public ReleaseFailureException (String message, Exception wrappedException){
+                super (message,wrappedException);
         }
 

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/remoting/client/sei/impl/CxfServiceEndpointClient.java

@@ -43 +43 @@
 
 import uk.ac.cardiff.model.event.AuthenticationEvent;
+import uk.ac.cardiff.model.event.EzproxyAuthenticationEvent;
+import uk.ac.cardiff.model.event.EzproxyProxyEvent;
+import uk.ac.cardiff.model.event.OpenathenslaAuthenticationEvent;
 import uk.ac.cardiff.model.event.ShibbolethIdpAuthenticationEvent;
 import uk.ac.cardiff.model.wsmodel.EventPushMessage;
@@ -72 +75 @@
             overrides.add(ShibbolethIdpAuthenticationEvent.class.getName());
             overrides.add(AuthenticationEvent.class.getName());
+            overrides.add(EzproxyAuthenticationEvent.class.getName());
+            overrides.add(OpenathenslaAuthenticationEvent.class.getName());
             databinding.setOverrideTypes(overrides);
 
             for (String typeName : overrides) {
-                Class c = null;
+                Class<?> c = null;
                 try {
                     c = ClassLoaderUtils.loadClass(typeName, TypeUtil.class);

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/store/AsynchronousEntryStoragePipeline.java

@@ -28 +28 @@
 
 
-public class AsynchronousEntryStoragePipeline implements StoreEntriesTaskCallbackInterface{
+public class AsynchronousEntryStoragePipeline {
 
         /** class logger */
@@ -48 +48 @@
         }
 
-        public void storageResultCallback(Object result) {
-                log.debug("Storage task completed {}, for transaction id [{}]",result, transactionId);
-
-        }
-
         /**
          * Starts and shuts down the <code>storeEntryTask</code> immediately, so that when it completes
@@ -59 +54 @@
          * @param events
          */
-        public void execute(List<Event> events){
-            StoreEntriesPipelineTask storeEntryTask = new StoreEntriesPipelineTask(entryHandler, attributeAssociationEngine, events,this);
+        public void execute(List<Event> events, StoreEntriesTaskCallbackInterface callback){
+            StoreEntriesPipelineTask storeEntryTask = new StoreEntriesPipelineTask(entryHandler, attributeAssociationEngine, events,callback);
             ExecutorService es = Executors.newSingleThreadExecutor();
             es.submit(storeEntryTask);

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/store/StorageEngine.java

@@ -31 +31 @@
  *
  */
-public class StorageEngine {
+public class StorageEngine  implements StoreEntriesTaskCallbackInterface{
 
     /** Class logger*/
@@ -43 +43 @@
     private AttributeAssociationEngine attributeAssociationEngine;
 
+    /** The ID of the currently executing transaction */
+    private int currentTransactionId;
+
+    /** Whether a transaction is currently in progress*/
+    private boolean transactionInProgress;
 
     /** Default Constructor*/
     public StorageEngine(){
+        transactionInProgress=false;
+    }
 
+    public void storageResultCallback(Object result) {
+        log.debug("Storage task completed {}, for transaction id [{}]",result, currentTransactionId);
+        transactionInProgress=false;
     }
 
@@ -52 +62 @@
      * @param events
      */
-    public void performAsynchronousEntryStoragePipeline(int transactionId, List<Event> events){
+    public void performAsynchronousEntryStoragePipeline(int transactionId, List<Event> events) throws TransactionInProgressException{
+        if (transactionInProgress){
+            throw new TransactionInProgressException("Transaction "+currentTransactionId+" currently in processing");
+        }
+        log.info("Committing {} entries to the storage engine, with transaction id [{}]", events.size(),transactionId);
+        transactionInProgress=true;
+        this.currentTransactionId = transactionId;
         AsynchronousEntryStoragePipeline asyncEntryStorage = new AsynchronousEntryStoragePipeline(transactionId, entryHandler,attributeAssociationEngine);
-        asyncEntryStorage.execute(events);
+        asyncEntryStorage.execute(events,this);
     }
 
@@ -103 +119 @@
 
 
+
+
 }

raptor-client/trunk/src/main/java/uk/ac/cardiff/raptor/store/impl/PersistantEntryHandler.java

@@ -121 +121 @@
                                 hashcode = ((Integer) ReflectionHelper.getValueFromObject("hashCode", event)).intValue();
                         } catch (Exception e) {
-                            log.error("Could not get hashcode for event {}, event not stored");
+                            log.error("Could not get hashcode for event {}, event not stored", event);
                             continue;
                         }