# HG changeset patch
# User casties
# Date 1478025916 -3600
# Node ID db3e1bbfde036f57015110b9c06dbf5a8c869b37
# Parent  16cbff5deb09c07ad1d92ec0410d5d2742d29d2f
fix error when EntityRepositoryBean is not available when deleting an entity.

diff -r 16cbff5deb09 -r db3e1bbfde03 src/main/java/de/mpiwg/itgroup/ismi/browse/EntityDetailsBean.java
--- a/src/main/java/de/mpiwg/itgroup/ismi/browse/EntityDetailsBean.java	Tue Nov 01 19:44:01 2016 +0100
+++ b/src/main/java/de/mpiwg/itgroup/ismi/browse/EntityDetailsBean.java	Tue Nov 01 19:45:16 2016 +0100
@@ -163,20 +163,32 @@
 		this.targetRelations.put(tarName, getWrapper().getTargetRelations(this.entity, tarName, null, -1));
 	}
 	
+	/**
+	 * Handler that deletes the current Entity.
+	 * @return
+	 */
 	public String listenerDeleteEntity(){
 		try {
-			EntityRepositoryBean bean = (EntityRepositoryBean)getSessionBean("EntityRepository");
-			String user = bean.getUserName();
+		    // get user name from SessionBean
+		    SessionBean session = (SessionBean) getSessionBean("Session");
+			String user = "";
+			if (session != null) {
+			    user = session.getUsername();
+			}
+
 			// delete entity
             getWrapper().removeCurrentVersionEntity(this.entity, user);
+            
+            // reset EntityRepositoryBean
+            EntityRepositoryBean bean = (EntityRepositoryBean) getSessionBean("EntityRepository");
 			if(bean != null){
 				bean.reset();	
 			}
 			addGeneralMsg("The entity has been removed.");
+			
 		} catch (Exception e) {
 			printInternalError(e);
 			logger.error(e.getMessage() + " Removing" + entity, e);
-			e.printStackTrace();
 		}
 		
 		return GOTO_ENTITY_REPOSITORY;