[Openutils-svn] SF.net SVN: openutils:[1512] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java

[<fg...@us...>]

Revision: 1512
          http://openutils.svn.sourceforge.net/openutils/?rev=1512&view=rev
Author:   fgiust
Date:     2009-12-20 20:23:46 +0000 (Sun, 20 Dec 2009)

Log Message:
-----------
MEDIA-38 better compatibility with magnolia 4.2 (4.2.2 already works, but navigation tag is buggy)

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2009-12-14 10:22:42 UTC (rev 1511)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2009-12-20 20:23:46 UTC (rev 1512)
@@ -30,7 +30,9 @@
 import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.cms.core.NodeData;
 import info.magnolia.cms.util.ExclusiveWrite;
+import info.magnolia.context.Context;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.context.MgnlContext.SystemContextOperation;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;
@@ -562,7 +564,7 @@
 
         try
         {
-            MgnlContext.doInSystemContext(new MgnlContext.SystemContextOperation()
+            ImageUtils.doInSystemContext(new MgnlContext.SystemContextOperation()
             {
 
                 /**
@@ -856,4 +858,18 @@
         return size;
     }
 
+    private static void doInSystemContext(SystemContextOperation op)
+    {
+        final Context originalCtx = MgnlContext.hasInstance() ? MgnlContext.getInstance() : null;
+        try
+        {
+            MgnlContext.setInstance(MgnlContext.getSystemContext());
+            op.exec();
+        }
+        finally
+        {
+            MgnlContext.setInstance(originalCtx);
+        }
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.