[jboss-svn-commits] JBoss Common SVN: r4576 - in javatar/trunk: src/main/java/org/jboss/javatar and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: ALRubinger
Date: 2010-06-28 12:22:09 -0400 (Mon, 28 Jun 2010)
New Revision: 4576

Modified:
   javatar/trunk/pom.xml
   javatar/trunk/src/main/java/org/jboss/javatar/TarGzOutputStream.java
Log:
[SHRINKWRAP-194] Implement flush() for TarGzOutStream so it does not NPE

Modified: javatar/trunk/pom.xml
===================================================================
--- javatar/trunk/pom.xml	2010-06-28 15:29:45 UTC (rev 4575)
+++ javatar/trunk/pom.xml	2010-06-28 16:22:09 UTC (rev 4576)
@@ -26,7 +26,7 @@
   <properties>
 
     <!-- Versioning -->
-    <version.junit_junit>4.6</version.junit_junit>
+    <version.junit_junit>4.7</version.junit_junit>
 
   </properties>
 
@@ -76,7 +76,7 @@
           <showDeprecation>false</showDeprecation>
           <showWarnings>true</showWarnings>
           <optimize>true</optimize>
-          <compilerVersion>1.6</compilerVersion>
+          <compilerVersion>1.5</compilerVersion>
           <fork>true</fork>
           <argLine>-Xmx512M</argLine>
           <executable>${JAVA_HOME}/bin/javac</executable>
@@ -116,7 +116,7 @@
               <version>[2.0.9,)</version>
             </requireMavenVersion>
             <requireJavaVersion>
-              <version>1.6.0</version>
+              <version>1.5.0</version>
             </requireJavaVersion>
             <requireProperty>
               <property>env.JAVA_HOME</property>
@@ -128,7 +128,17 @@
     </plugins>
 
   </build>
+  
+  <!-- Dependencies -->
+  <dependencies>
 
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+
+  </dependencies>
+
   <!-- Dependency Management -->
   <dependencyManagement>
     <dependencies>

Modified: javatar/trunk/src/main/java/org/jboss/javatar/TarGzOutputStream.java
===================================================================
--- javatar/trunk/src/main/java/org/jboss/javatar/TarGzOutputStream.java	2010-06-28 15:29:45 UTC (rev 4575)
+++ javatar/trunk/src/main/java/org/jboss/javatar/TarGzOutputStream.java	2010-06-28 16:22:09 UTC (rev 4576)
@@ -74,6 +74,7 @@
 	close()
 		throws IOException
 		{
+	   this.flush();
 		this.tos.close();
 		this.gzip.finish();
 		}
@@ -112,7 +113,7 @@
 			this.tos.putNextEntry( this.currentEntry );
 			this.bos.writeTo( this.tos );
 			this.tos.closeEntry();
-			this.currentEntry = null;
+			this.currentEntry = null; 
 			this.bos = new ByteArrayOutputStream();
 			}
 		}
@@ -159,4 +160,14 @@
 			}
 		}
 
+	/**
+	 * {@inheritDoc}
+	 * @see java.io.FilterOutputStream#flush()
+	 */
+   @Override
+   public void flush() throws IOException
+   {
+      this.bos.flush();      
+   }
+
 	}