[dna-commits] DNA SVN: r1156 - trunk/extensions/dna-connector-filesystem/src/main/java/org/jboss/dna/connector/filesystem.

[dna-commits at lists.jboss.org]

Author: bcarothers
Date: 2009-08-06 16:41:42 -0400 (Thu, 06 Aug 2009)
New Revision: 1156

Modified:
   trunk/extensions/dna-connector-filesystem/src/main/java/org/jboss/dna/connector/filesystem/FileSystemRequestProcessor.java
Log:
DNA-503 File system connector unit tests are failing

Manually merged DNA-503.patch to attempt to address Hudson failures.  

Modified: trunk/extensions/dna-connector-filesystem/src/main/java/org/jboss/dna/connector/filesystem/FileSystemRequestProcessor.java
===================================================================
--- trunk/extensions/dna-connector-filesystem/src/main/java/org/jboss/dna/connector/filesystem/FileSystemRequestProcessor.java	2009-08-06 17:42:22 UTC (rev 1155)
+++ trunk/extensions/dna-connector-filesystem/src/main/java/org/jboss/dna/connector/filesystem/FileSystemRequestProcessor.java	2009-08-06 20:41:42 UTC (rev 1156)
@@ -457,6 +457,7 @@
 
                     } finally {
                         try {
+                            if (checkForContents != null) checkForContents.close();
                             checkForContents.close();
                         } catch (Exception ignore) {
                         }
@@ -535,10 +536,12 @@
 
             if (!newFile.mkdir()) {
                 I18n msg = FileSystemI18n.couldNotCreateFile;
-                request.setError(new RepositorySourceException(getSourceName(), msg.text(parent.getPath(),
-                                                                                         request.inWorkspace(),
-                                                                                         getSourceName(),
-                                                                                         primaryType.getString(registry))));
+                request.setError(new RepositorySourceException(
+                                                               getSourceName(),
+                                                               msg.text(parent.getPath(),
+                                                                        request.inWorkspace(),
+                                                                        getSourceName(),
+                                                                        primaryType == null ? "null" : primaryType.getString(registry))));
                 return;
             }
         } else {