[servicemix-scm] [986] trunk/core/src/main/java/org/servicemix/jbi/framework: Fix problems with the embedded flag to honored

[scm]

Title: [986] trunk/core/src/main/java/org/servicemix/jbi/framework: Fix problems with the embedded flag to honored

Revision

986

Author

gnt

Date

2005-12-01 20:29:48 -0500 (Thu, 01 Dec 2005)

Log Message

Fix problems with the embedded flag to honored

Modified Paths

• trunk/core/src/main/java/org/servicemix/jbi/container/EnvironmentContext.java
• trunk/core/src/main/java/org/servicemix/jbi/framework/AutoDeploymentService.java

Diff

Modified: trunk/core/src/main/java/org/servicemix/jbi/container/EnvironmentContext.java (985 => 986)

--- trunk/core/src/main/java/org/servicemix/jbi/container/EnvironmentContext.java	2005-12-01 15:42:34 UTC (rev 985)
+++ trunk/core/src/main/java/org/servicemix/jbi/container/EnvironmentContext.java	2005-12-02 01:29:48 UTC (rev 986)
@@ -473,12 +473,12 @@
 
 
     private void buildDirectoryStructure() throws JBIException  {
+        // We want ServiceMix to be able to run embedded
+        // so do not create the directory structure if the root does not exist
+        if (container.isEmbedded()) {
+            return;
+        }
         if (!jbiRootDir.exists()) {
-            // We want ServiceMix to be able to run embedded
-            // so do not create the directory structure if the root does not exist
-            if (container.isEmbedded()) {
-                return;
-            }
             if (!jbiRootDir.mkdirs()) {
             	throw new JBIException("Directory could not be created: "+jbiRootDir.getAbsolutePath());
             }

Modified: trunk/core/src/main/java/org/servicemix/jbi/framework/AutoDeploymentService.java (985 => 986)

--- trunk/core/src/main/java/org/servicemix/jbi/framework/AutoDeploymentService.java	2005-12-01 15:42:34 UTC (rev 985)
+++ trunk/core/src/main/java/org/servicemix/jbi/framework/AutoDeploymentService.java	2005-12-02 01:29:48 UTC (rev 986)
@@ -468,7 +468,7 @@
     }
 
     private void scheduleDirectoryTimer() {
-        if (isMonitorInstallationDirectory()) {
+        if (isMonitorInstallationDirectory() && !container.isEmbedded()) {
             if (statsTimer == null) {
                 statsTimer = new Timer(true);
             }