From f981fd2c532a799da7a1360ca2f277494a7fabe1 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Sun, 1 Dec 2013 19:30:57 -0500
Subject: [PATCH 1/2] VIVO-588 Fixed a typo to fix the deadlocked threads.

---
 .../edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java
index 23e300013..fd333560b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java
@@ -537,13 +537,14 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
         List<String> actions = new ArrayList<String>();
         
         Model dModel = getOntModelSelector().getDisplayModel();
+        dModel.enterCriticalSection(false);
         try{
             QueryExecution qe = 
                 QueryExecutionFactory.create( requiredActionsQuery, dModel, initialBindings);
             actions = executeQueryToList( qe );
             qe.close();
         }finally{
-            dModel.enterCriticalSection(false);
+            dModel.leaveCriticalSection();
         }
         return actions;            
     }

From 356e86de704e5ef74f7a3ddb9d5fc9027fdc59a7 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Sun, 1 Dec 2013 19:32:43 -0500
Subject: [PATCH 2/2] =?UTF-8?q?VIVO-581=20Don=E2=80=99t=20check=20for=20?=
 =?UTF-8?q?=E2=80=9Cregular=20files=E2=80=9D,=20just=20check=20for=20?=
 =?UTF-8?q?=E2=80=9Cnot=20directory=E2=80=9D.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/freemarker/loader/FreemarkerTemplateLoader.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoader.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoader.java
index 2ae556862..0bef38b30 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoader.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoader.java
@@ -285,7 +285,7 @@ public class FreemarkerTemplateLoader implements TemplateLoader {
 		}
 
 		public boolean fileQualifies(Path path) {
-			return Files.isRegularFile(path) && Files.isReadable(path);
+			return Files.isReadable(path) && !Files.isDirectory(path);
 		}
 
 		public SortedSet<PathPieces> getMatches() {