[dna-commits] DNA SVN: r1380 - trunk/dna-jcr/src/main/java/org/jboss/dna/jcr.

[dna-commits at lists.jboss.org]

Author: rhauch
Date: 2009-12-01 22:33:15 -0500 (Tue, 01 Dec 2009)
New Revision: 1380

Modified:
   trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java
Log:
DNA-566 Changed one of the if-checks on the recent commit to use the WORKSPACES_SHARE_SYSTEM_BRANCH flag instead of a null pointer check, so that it's very clear where all of the situations are that use this flag.

Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java
===================================================================
--- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java	2009-12-02 03:24:38 UTC (rev 1379)
+++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java	2009-12-02 03:33:15 UTC (rev 1380)
@@ -694,7 +694,7 @@
                 // Verify that the workspace exists (or can be created) ...
                 Set<String> workspaces = graph.getWorkspaces();
                 if (!workspaces.contains(workspaceName)) {
-                    if (this.federatedSource != null) {
+                    if (WORKSPACES_SHARE_SYSTEM_BRANCH) {
                         // Make sure there isn't a federated workspace ...
                         this.federatedSource.removeWorkspace(workspaceName);
                     }