[infinispan-commits] Infinispan SVN: r1630 - in trunk/core/src: main/java/org/infinispan/loaders/file and 3 other directories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-03-29 09:36:31 -0400 (Mon, 29 Mar 2010)
New Revision: 1630

Modified:
   trunk/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java
   trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
   trunk/core/src/main/java/org/infinispan/util/Util.java
   trunk/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java
Log:
Made Util.close() more universal

Modified: trunk/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java	2010-03-29 11:34:30 UTC (rev 1629)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java	2010-03-29 13:36:31 UTC (rev 1630)
@@ -173,7 +173,7 @@
          convertor.parse(is, fos, "xslt/ehcache1x2infinispan4x.xslt");
       } finally {
          Util.flushAndCloseStream(fos);
-         Util.closeStream(is);
+         Util.close(is);
       }
    }
 
@@ -222,7 +222,7 @@
          convertor = new ConfigFilesConvertor();
          convertor.parse(is, fos, "xslt/jgroupsFileGen.xslt");
       } finally {
-         Util.closeStream(is);
+         Util.close(is);
          Util.flushAndCloseStream(fos);
       }
 
@@ -256,7 +256,7 @@
          converter.parse(is, fos, "xslt/ehcache1x2infinispan4x.xslt");
       } finally {
          Util.flushAndCloseStream(fos);
-         Util.closeStream(is);
+         Util.close(is);
       }
    }
 

Modified: trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java	2010-03-29 11:34:30 UTC (rev 1629)
+++ trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java	2010-03-29 13:36:31 UTC (rev 1630)
@@ -112,8 +112,8 @@
                   objectOutput.write(buffer, 0, bytesRead);
                }
             } finally {
-               Util.closeStream(bis);
-               Util.closeStream(fileInStream);
+               Util.close(bis);
+               Util.close(fileInStream);
             }
          }
       } catch (IOException e) {

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java	2010-03-29 11:34:30 UTC (rev 1629)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java	2010-03-29 13:36:31 UTC (rev 1630)
@@ -567,7 +567,7 @@
          mon.notifyStateReceiptFailed(e instanceof StateTransferException ? (StateTransferException) e : new StateTransferException(e));
          log.error("Caught while requesting or applying state", e);
       } finally {
-         Util.closeStream(istream);
+         Util.close(istream);
       }
    }
 

Modified: trunk/core/src/main/java/org/infinispan/util/Util.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/Util.java	2010-03-29 11:34:30 UTC (rev 1629)
+++ trunk/core/src/main/java/org/infinispan/util/Util.java	2010-03-29 13:36:31 UTC (rev 1630)
@@ -21,6 +21,7 @@
  */
 package org.infinispan.util;
 
+import java.io.Closeable;
 import java.io.InputStream;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
@@ -184,24 +185,14 @@
       return nf.format(toPrint) + " hours";
    }
 
-   public static void closeStream(InputStream i) {
-      if (i == null) return;
+   public static void close(Closeable cl) {
+      if (cl == null) return;
       try {
-         i.close();
+         cl.close();
       } catch (Exception e) {
-
       }
    }
 
-   public static void closeInput(ObjectInput i) {
-      if (i == null) return;
-      try {
-         i.close();
-      } catch (Exception e) {
-
-      }
-   }
-
    public static void flushAndCloseStream(OutputStream o) {
       if (o == null) return;
       try {
@@ -260,4 +251,14 @@
 
       return sb.toString();
    }
+
+   public static String padString(String s, int minWidth) {
+      if (s.length() < minWidth) {
+         StringBuilder sb = new StringBuilder(s);
+         while (sb.length() < minWidth) sb.append(" ");
+         return sb.toString();
+      }
+      return s;
+   }
+
 }

Modified: trunk/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java	2010-03-29 11:34:30 UTC (rev 1629)
+++ trunk/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java	2010-03-29 13:36:31 UTC (rev 1630)
@@ -56,7 +56,12 @@
    }
 
    public void finishObjectInput(ObjectInput oi) {
-      Util.closeInput(oi);
+      if (oi != null) {
+         try {
+            oi.close();
+         } catch (IOException e) {
+         }
+      }
    }
 
    public ByteBuffer objectToBuffer(Object o) throws IOException {