geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1104442 - /geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java
Date Tue, 17 May 2011 18:04:43 GMT
Author: gawor
Date: Tue May 17 18:04:43 2011
New Revision: 1104442

URL: http://svn.apache.org/viewvc?rev=1104442&view=rev
Log:
just untabify

Modified:
    geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java

Modified: geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java?rev=1104442&r1=1104441&r2=1104442&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java
(original)
+++ geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java
Tue May 17 18:04:43 2011
@@ -231,7 +231,7 @@ public class DirectoryMonitor implements
         if (monitorFile == null) {
             return;
         }
-    
+        
         log.info("Persisting directory monitor state to " + monitorFile.getName());
         ObjectOutputStream outputStream = null;
         try {
@@ -244,7 +244,7 @@ public class DirectoryMonitor implements
                 try {
                     outputStream.close();
                 } catch (IOException ioe) {
-
+                    
                 }
             }
         }    
@@ -252,30 +252,30 @@ public class DirectoryMonitor implements
     
     @SuppressWarnings("unchecked")
     private Map<String,FileInfo> readState() {
-    	Map<String,FileInfo> newFiles = null;
-    	if (monitorFile != null) {
-    		ObjectInputStream inputStream = null;
-    		try {
-    			inputStream = new ObjectInputStream(new FileInputStream(monitorFile));
-    			newFiles = (Map<String,FileInfo>) inputStream.readObject();
-    		} catch (IOException ex) {
-    			log.info("No directory monitor state to be read. This is to be expected on initial
start of a new server");
-    		} catch (ClassNotFoundException cnfe) {
-    			log.warn("ClassNotFoundException reading directory monitor state from " + monitorFile.getName(),
cnfe);
-    		} finally {
-    			try {
-    				if (inputStream != null) {
-    					inputStream.close();
-    				}
-    			} catch (IOException ioe) {
-    				// ignore
-    			}
-    		}
-    	}
-		if (newFiles == null) {
-			newFiles = new HashMap<String,FileInfo>();
-		}
-		return newFiles;
+        Map<String,FileInfo> newFiles = null;
+        if (monitorFile != null) {
+                ObjectInputStream inputStream = null;
+                try {
+                    inputStream = new ObjectInputStream(new FileInputStream(monitorFile));
+                    newFiles = (Map<String,FileInfo>) inputStream.readObject();
+                } catch (IOException ex) {
+                    log.info("No directory monitor state to be read. This is to be expected
on initial start of a new server");
+                } catch (ClassNotFoundException cnfe) {
+                    log.warn("ClassNotFoundException reading directory monitor state from
" + monitorFile.getName(), cnfe);
+                } finally {
+                    try {
+                        if (inputStream != null) {
+                            inputStream.close();
+                        }
+                    } catch (IOException ioe) {
+                        // ignore
+                    }
+                }
+        }
+        if (newFiles == null) {
+            newFiles = new HashMap<String,FileInfo>();
+        }
+        return newFiles;
     }
     
     public void run() {
@@ -592,7 +592,7 @@ public class DirectoryMonitor implements
     }
 
     private static class FileInfo implements Serializable {
-		private String path;
+        private String path;
         private long size;
         private long modified;
         private boolean newFile;



Mime
View raw message