Merge pull request #1843 from joshmoore/disable-chgrp-event-logs

Disable chgrp event logs
ome · Jan 7, 2014 · daa2557 · daa2557
2 parents 9596452 + 92b6abe
commit daa2557
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 27 deletions.
diff --git a/build.xml b/build.xml
@@ -942,6 +942,12 @@ omero.version=${omero.version}
         <hotdeploy component="${server.comp}" targets="${targets}"/>
     </target>
 
+    <target name="hot-bioformats" depends="init" description="Re-launch running bioformats with new bioformats.jar">
+        <property name="targets" value="dist"/>
+        <hotdeploy component="${basedir}/components/bioformats" targets="${targets}"/>
+    </target>
+
+
     <macrodef name="hotdeploy">
         <attribute name="targets"/>
         <attribute name="component"/>

diff --git a/components/blitz/src/omero/cmd/graphs/ChgrpI.java b/components/blitz/src/omero/cmd/graphs/ChgrpI.java
@@ -7,6 +7,8 @@
 
 package omero.cmd.graphs;
 
+import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -22,6 +24,7 @@
 import ome.services.graphs.GraphException;
 import ome.services.graphs.GraphSpec;
 import ome.services.graphs.GraphState;
+import ome.services.messages.EventLogMessage;
 import ome.system.EventContext;
 import ome.system.ServiceFactory;
 import ome.tools.hibernate.HibernateUtils;
@@ -139,6 +142,7 @@ public void init(Helper helper) {
 
     }
 
+    @SuppressWarnings("deprecation")
     public Object step(int i) throws Cancel {
         helper.assertStep(i);
 
@@ -150,6 +154,20 @@ public Object step(int i) throws Cancel {
                 Session s = helper.getSession();
                 IObject obj = spec.load(s);
                 s.refresh(obj);
+
+                EventLogMessage elm = new EventLogMessage(this, "CHGRP",
+                        obj.getClass(),
+                        Arrays.asList(Long.valueOf(this.id)));
+
+                try {
+                    helper.getServiceFactory()
+                        .getContext().publishMessage(elm);
+                } catch (Throwable t) {
+                    GraphException de = new GraphException("EventLogMessage failed.");
+                    de.initCause(t);
+                    throw de;
+                }
+
                 return null;
             } else {
                 return state.execute(i);

diff --git a/components/server/src/ome/services/chgrp/ChgrpStep.java b/components/server/src/ome/services/chgrp/ChgrpStep.java
@@ -169,16 +169,6 @@ private Long findImproperIncomingLinks(Session session, String[] lock) {
     @Override
     public void onRelease(Class<IObject> k, Set<Long> ids)
             throws GraphException {
-        EventLogMessage elm = new EventLogMessage(this, "CHGRP", k,
-                new ArrayList<Long>(ids));
-
-        try {
-            ctx.publishMessage(elm);
-        } catch (Throwable t) {
-            GraphException de = new GraphException("EventLogMessage failed.");
-            de.initCause(t);
-            throw de;
-        }
 
     }
 

diff --git a/components/server/src/ome/services/chgrp/ChgrpValidation.java b/components/server/src/ome/services/chgrp/ChgrpValidation.java
@@ -132,16 +132,6 @@ private Long findImproperOutgoingLinks(Session session, String[] lock) {
     @Override
     public void onRelease(Class<IObject> k, Set<Long> ids)
             throws GraphException {
-        EventLogMessage elm = new EventLogMessage(this, "CHGRP-VALIDATION", k,
-                new ArrayList<Long>(ids));
-
-        try {
-            ctx.publishMessage(elm);
-        } catch (Throwable t) {
-            GraphException de = new GraphException("EventLogMessage failed.");
-            de.initCause(t);
-            throw de;
-        }
 
     }
 

diff --git a/components/server/src/ome/services/graphs/GraphStep.java b/components/server/src/ome/services/graphs/GraphStep.java
@@ -176,14 +176,14 @@ public void setEventContext(EventContext ec) {
         this.ec = ec;
     }
 
+    /**
+     * Currently returns the ID array without copying
+     * therefore values should not be leaked to code outside
+     * of the ome.services.graphs hierarchy. Non-copying is
+     * primarily intended to reduce GC overhead.
+     */
     public long[] getIds() {
-        if (this.ids == null) {
-            return null;
-        }
-
-        long[] copy = new long[ids.length];
-        System.arraycopy(ids, 0, copy, 0, copy.length);
-        return copy;
+        return this.ids;
     }
 
     //