diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/WorkspaceEventCollector.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/WorkspaceEventCollector.java index bd03306..823d57e 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/WorkspaceEventCollector.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/WorkspaceEventCollector.java @@ -16,15 +16,14 @@ import org.gcube.common.homelibrary.home.workspace.events.WorkspaceListener; */ public class WorkspaceEventCollector implements WorkspaceListener { - protected Logger logger; + protected static Logger logger = Logger.getLogger(WorkspaceEventCollector.class); protected BlockingQueue eventsQueue = new LinkedBlockingQueue(); /** * @param logger */ - public WorkspaceEventCollector(Logger logger) { - this.logger = logger; + public WorkspaceEventCollector() { } /** diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java index 4d3892b..6e4e8d3 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java @@ -170,6 +170,7 @@ public class WsUtil { Workspace workspace = HomeLibrary.getUserWorkspace(session.getUsername()); + /* if (session.getAttribute(METADATACONVERTER_ATTRIBUTE) == null){ logger.trace("Initializing the Metadata converter"); @@ -196,10 +197,11 @@ public class WsUtil { logger.trace("Initializing the event collector"); //we prepare the event collector - WorkspaceEventCollector eventCollector = new WorkspaceEventCollector(logger); + WorkspaceEventCollector eventCollector = new WorkspaceEventCollector(); workspace.addWorkspaceListener(eventCollector); session.setAttribute(WORKSPACE_EVENT_COLLECTOR_ATTRIBUTE, eventCollector); } + */ if (session.getAttribute(WORKSPACEBUILDER_ATTRIBUTE) == null) { @@ -218,29 +220,29 @@ public class WsUtil { } - public static MetadataConverter getMetadataConverter(Logger logger, HttpSession httpSession) - { - MetadataConverter mc = (MetadataConverter) httpSession.getAttribute(METADATACONVERTER_ATTRIBUTE); +// public static MetadataConverter getMetadataConverter(Logger logger, HttpSession httpSession) +// { +// MetadataConverter mc = (MetadataConverter) httpSession.getAttribute(METADATACONVERTER_ATTRIBUTE); +// +// if (mc==null) +// { +// +// mc = new MetadataConverter(logger); +// ASLSession session = getAslSession(httpSession); +// mc.setup(session); +// session.setAttribute(METADATACONVERTER_ATTRIBUTE, mc); +// } +// +// mc.isReady(); +// +// return mc; +// } - if (mc==null) - { - - mc = new MetadataConverter(logger); - ASLSession session = getAslSession(httpSession); - mc.setup(session); - session.setAttribute(METADATACONVERTER_ATTRIBUTE, mc); - } - - mc.isReady(); - - return mc; - } - - public static WorkspaceEventCollector getEventCollector(HttpSession httpSession) - { - ASLSession session = getAslSession(httpSession); - return (WorkspaceEventCollector) session.getAttribute(WsUtil.WORKSPACE_EVENT_COLLECTOR_ATTRIBUTE); - } +// public static WorkspaceEventCollector getEventCollector(HttpSession httpSession) +// { +// ASLSession session = getAslSession(httpSession); +// return (WorkspaceEventCollector) session.getAttribute(WsUtil.WORKSPACE_EVENT_COLLECTOR_ATTRIBUTE); +// } public static GWTWorkspaceBuilder getGWTWorkspaceBuilder(HttpSession httpSession) {