svn commit: r811272 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: component/file/FileOperations.java impl/DefaultCamelContext.java

[davsclaus]

Author: davsclaus
Date: Fri Sep  4 08:25:11 2009
New Revision: 811272

URL: http://svn.apache.org/viewvc?rev=811272&view=rev
Log:
CAMEL-1987: Easier to disable JMX. CAMEL-1965: Added retry for renaming and 
deleting files as Windows have potential problems here.

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java?rev=811272&r1=811271&r2=811272&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
 Fri Sep  4 08:25:11 2009
@@ -64,8 +64,12 @@
         boolean deleted = false;
         int count = 0;
         while (!deleted && count < 3) {
+            if (LOG.isDebugEnabled() && count > 0) {
+                LOG.debug("Retrying attempt " + count + " to delete file: " + 
name);
+            }
+
             deleted = file.delete();
-            if (count > 0) {
+            if (!deleted && count > 0) {
                 try {
                     Thread.sleep(1000);
                 } catch (InterruptedException e) {
@@ -74,6 +78,11 @@
             }
             count++;
         }
+
+
+        if (LOG.isDebugEnabled() && count > 0) {
+            LOG.debug("Tried " + count + " to delete file: " + name + " with 
result: " + deleted);
+        }
         return deleted;
     }
 
@@ -91,8 +100,12 @@
         boolean renamed = false;
         int count = 0;
         while (!renamed && count < 3) {
+            if (LOG.isDebugEnabled() && count > 0) {
+                LOG.debug("Retrying attempt " + count + " to rename file from: 
" + from + " to: " + to);
+            }
+
             renamed = file.renameTo(target);
-            if (count > 0) {
+            if (!renamed && count > 0) {
                 try {
                     Thread.sleep(1000);
                 } catch (InterruptedException e) {
@@ -101,6 +114,10 @@
             }
             count++;
         }
+
+        if (LOG.isDebugEnabled() && count > 0) {
+            LOG.debug("Tried " + count + " to rename file: " + from + " to: " 
+ to + " with result: " + renamed);
+        }
         return renamed;
     }
 

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=811272&r1=811271&r2=811272&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 Fri Sep  4 08:25:11 2009
@@ -1175,6 +1175,10 @@
         return defaultTracer;
     }
 
+    public void disableJMX() {
+        disableJMX = true;
+    }
+
     protected synchronized String getEndpointKey(String uri, Endpoint 
endpoint) {
         if (endpoint.isSingleton()) {
             return uri;
@@ -1225,12 +1229,6 @@
         return answer;
     }
 
-    public void disableJMX() {
-        disableJMX = true;
-        LOG.info("JMX is disabled. Using DefaultManagementStrategy.");
-        setManagementStrategy(new DefaultManagementStrategy());
-    }
-
     @Override
     public String toString() {
         return "CamelContext(" + getName() + ")";