Index: src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java
===================================================================
--- src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java	(revision 684404)
+++ src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java	(working copy)
@@ -72,7 +72,23 @@
         String expectedLinks[] = new String[] { "../", "apache/", "codehaus/" };
         assertLinks(expectedLinks, response.getLinks());
     }
+
+    public void testGetDirectoryWhichHasMatchingFile() //MRM-893
+        throws Exception
+    {
+        new File( repoRootInternal, "org/apache/archiva/artifactId/1.0" ).mkdirs();
+        new File( repoRootInternal, "org/apache/archiva/artifactId/1.0/artifactId-1.0.jar" ).createNewFile();
+
+        WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/internal/org/apache/archiva/artifactId/1.0/artifactId-1.0.jar" );
+        WebResponse response = sc.getResponse( request );
+        assertEquals( "Response", HttpServletResponse.SC_OK, response.getResponseCode() );
+        
+        request = new GetMethodWebRequest( "http://machine.com/repository/internal/org/apache/archiva/artifactId/1.0/artifactId-1.0.jar/" );
+        response = sc.getResponse( request );
+        assertEquals( "Response", HttpServletResponse.SC_NOT_FOUND, response.getResponseCode() );
+    }
     
+    
     private void assertLinks(String expectedLinks[], WebLink actualLinks[])
     {
         assertEquals( "Links.length", expectedLinks.length, actualLinks.length );
Index: src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
===================================================================
--- src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java	(revision 684404)
+++ src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java	(working copy)
@@ -409,6 +409,17 @@
         throws DavException
     {
         File resourceFile = new File( managedRepository.getRepoRoot(), logicalResource.getPath() );
+        
+        //MRM-893, dont send back a file when user intentionally wants a directory
+        if ( locator.getHref( false ).endsWith( "/" ) )
+        {
+            if ( ! resourceFile.isDirectory() )
+            {
+                //force a resource not found 
+                return null;
+            }
+        }
+
         ArchivaDavResource resource =
             new ArchivaDavResource( resourceFile.getAbsolutePath(), logicalResource.getPath(),
                                     managedRepository.getRepository(), request.getRemoteAddr(),