[exo-jcr-commits] exo-jcr SVN: r5284 - in ws/trunk/exo.ws.rest.ext/src: test/java/org/exoplatform/services/rest/ext/groovy and 1 other directory.

[do-not-reply at jboss.org]

Author: nfilotto
Date: 2011-12-08 09:38:30 -0500 (Thu, 08 Dec 2011)
New Revision: 5284

Added:
   ws/trunk/exo.ws.rest.ext/src/test/java/org/exoplatform/services/rest/ext/groovy/DefaultGroovyResourceLoaderTest.java
Modified:
   ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/DefaultGroovyResourceLoader.java
Log:
EXOJCR-1678: DefaultGroovyResourceLoader caches results of unsuccessful loading of groovy files.

Modified: ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/DefaultGroovyResourceLoader.java
===================================================================
--- ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/DefaultGroovyResourceLoader.java	2011-12-08 12:33:04 UTC (rev 5283)
+++ ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/DefaultGroovyResourceLoader.java	2011-12-08 14:38:30 UTC (rev 5284)
@@ -147,7 +147,7 @@
       }
       catch (CancellationException e)
       {
-         findResourceURLTasks.remove(filename, findResourceURLTask);
+         // ignore me
       }
       catch (ExecutionException e)
       {
@@ -157,6 +157,10 @@
       {
          Thread.currentThread().interrupt();
       }
+      finally
+      {
+         findResourceURLTasks.remove(filename, findResourceURLTask);
+      }
       return null;
    }
 

Added: ws/trunk/exo.ws.rest.ext/src/test/java/org/exoplatform/services/rest/ext/groovy/DefaultGroovyResourceLoaderTest.java
===================================================================
--- ws/trunk/exo.ws.rest.ext/src/test/java/org/exoplatform/services/rest/ext/groovy/DefaultGroovyResourceLoaderTest.java	                        (rev 0)
+++ ws/trunk/exo.ws.rest.ext/src/test/java/org/exoplatform/services/rest/ext/groovy/DefaultGroovyResourceLoaderTest.java	2011-12-08 14:38:30 UTC (rev 5284)
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2011 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.services.rest.ext.groovy;
+
+import org.exoplatform.services.rest.ext.BaseTest;
+
+import java.io.File;
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:nfilotto at exoplatform.com">Nicolas Filotto</a>
+ * @version $Id$
+ *
+ */
+public class DefaultGroovyResourceLoaderTest extends BaseTest
+{
+   private DefaultGroovyResourceLoader groovyResourceLoader;
+   private URL root;
+   
+   public void setUp() throws Exception
+   {
+      super.setUp();
+      root = Thread.currentThread().getContextClassLoader().getResource("repo");
+      root = new URL(root.toString() + '/');
+      groovyResourceLoader = new DefaultGroovyResourceLoader(root);
+   }
+   
+   public void testLoadGroovySource() throws Exception
+   {
+      URL url = groovyResourceLoader.loadGroovySource("MyClass");
+      assertNull(url);
+      File f = new File(new URL(root, "MyClass.groovy").toURI());
+      f.createNewFile();
+      url = groovyResourceLoader.loadGroovySource("MyClass");
+      assertNotNull(url);
+   }
+}