diff --git a/source/java/org/alfresco/repo/lock/LockUtils.java b/source/java/org/alfresco/repo/lock/LockUtils.java
index 3b0a976a6c..4ead09c717 100644
--- a/source/java/org/alfresco/repo/lock/LockUtils.java
+++ b/source/java/org/alfresco/repo/lock/LockUtils.java
@@ -64,7 +64,7 @@ public class LockUtils
         case LOCK_EXPIRED:
             return false;
         case LOCK_OWNER:
-            return !lockService.getLockType(nodeRef).equals(LockType.WRITE_LOCK);
+            return lockService.getLockType(nodeRef) != LockType.WRITE_LOCK;
         default:
             return true;
         }
diff --git a/source/test-java/org/alfresco/repo/lock/LockUtilsTest.java b/source/test-java/org/alfresco/repo/lock/LockUtilsTest.java
new file mode 100644
index 0000000000..c1af3bead0
--- /dev/null
+++ b/source/test-java/org/alfresco/repo/lock/LockUtilsTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2005-2013 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco 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 Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.lock;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.when;
+
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.lock.LockStatus;
+import org.alfresco.service.cmr.lock.LockType;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+/**
+ * Tests for the {@link LockUtils} class.
+ * 
+ * @author Matt Ward
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class LockUtilsTest
+{
+    private @Mock LockService lockService;
+    private final NodeRef nodeRef = new NodeRef("workspace://SpacesStore/node-id");
+    
+    @Test
+    public void testIsLockedAndReadOnly_ForLockOwnerWithNullLockType()
+    {
+        when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_OWNER);
+        when(lockService.getLockType(nodeRef)).thenReturn(null);
+        
+        boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
+        assertEquals(true, returnedVal);
+    }
+    
+    @Test
+    public void testIsLockedAndReadOnly_ForLockOwnerWithWriteLockType()
+    {
+        when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_OWNER);
+        when(lockService.getLockType(nodeRef)).thenReturn(LockType.WRITE_LOCK);
+        
+        boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
+        assertEquals(false, returnedVal);
+    }
+    
+    @Test
+    public void testIsLockedAndReadOnly_ForLockOwnerWithNodeLockType()
+    {
+        when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_OWNER);
+        when(lockService.getLockType(nodeRef)).thenReturn(LockType.NODE_LOCK);
+        
+        boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
+        assertEquals(true, returnedVal);
+    }
+    
+    @Test
+    public void testIsLockedAndReadOnly_ForLockOwnerWithReadOnlyLockType()
+    {
+        when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_OWNER);
+        when(lockService.getLockType(nodeRef)).thenReturn(LockType.READ_ONLY_LOCK);
+        
+        boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
+        assertEquals(true, returnedVal);
+    }
+
+    @Test
+    public void testIsLockedAndReadOnly_ForNoLock()
+    {
+        when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.NO_LOCK);
+        
+        boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
+        assertEquals(false, returnedVal);
+    }
+    
+    @Test
+    public void testIsLockedAndReadOnly_ForExpiredLock()
+    {
+        when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_EXPIRED);
+        
+        boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
+        assertEquals(false, returnedVal);
+    }
+    
+    @Test
+    public void testIsLockedAndReadOnly_ForLock()
+    {
+        when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCKED);
+        
+        boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
+        assertEquals(true, returnedVal);
+    }
+}