[dna-commits] DNA SVN: r727 - in trunk: extensions/dna-connector-filesystem/src/main/java/org/jboss/dna/connector/filesystem and 1 other directory.

[dna-commits at lists.jboss.org]

Author: rhauch
Date: 2009-02-13 16:55:20 -0500 (Fri, 13 Feb 2009)
New Revision: 727

Modified:
   trunk/extensions/dna-connector-filesystem/src/main/java/org/jboss/dna/connector/filesystem/FileSystemSource.java
   trunk/pom.xml
Log:
Corrected NPE in FileSystemSource, and added dna-connector-filesystem into the POM (not sure why it was missing)

Modified: trunk/extensions/dna-connector-filesystem/src/main/java/org/jboss/dna/connector/filesystem/FileSystemSource.java
===================================================================
--- trunk/extensions/dna-connector-filesystem/src/main/java/org/jboss/dna/connector/filesystem/FileSystemSource.java	2009-02-13 17:23:46 UTC (rev 726)
+++ trunk/extensions/dna-connector-filesystem/src/main/java/org/jboss/dna/connector/filesystem/FileSystemSource.java	2009-02-13 21:55:20 UTC (rev 727)
@@ -95,7 +95,7 @@
     private volatile int retryLimit = DEFAULT_RETRY_LIMIT;
     private volatile int cacheTimeToLiveInMilliseconds = DEFAULT_CACHE_TIME_TO_LIVE_IN_SECONDS * 1000;
     private volatile String defaultWorkspace;
-    private volatile String[] predefinedWorkspaces;
+    private volatile String[] predefinedWorkspaces = new String[] {};
     private volatile RepositorySourceCapabilities capabilities = new RepositorySourceCapabilities(SUPPORTS_SAME_NAME_SIBLINGS,
                                                                                                   DEFAULT_SUPPORTS_UPDATES,
                                                                                                   SUPPORTS_EVENTS,
@@ -375,6 +375,7 @@
             for (String predefined : this.predefinedWorkspaces) {
                 this.availableWorkspaceNames.add(predefined);
             }
+
             // Report the warnings for non-existant predefined workspaces
             reportWarnings = true;
             for (String path : this.availableWorkspaceNames) {

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-02-13 17:23:46 UTC (rev 726)
+++ trunk/pom.xml	2009-02-13 21:55:20 UTC (rev 727)
@@ -126,6 +126,7 @@
 		<module>extensions/dna-sequencer-xml</module>
 		<module>extensions/dna-sequencer-zip</module>
 		<module>extensions/dna-connector-federation</module>
+		<module>extensions/dna-connector-filesystem</module>
 		<module>extensions/dna-connector-jbosscache</module>
 		<module>extensions/dna-connector-svn</module>
 		<module>extensions/dna-connector-store-jpa</module>