commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1003340 - in /commons/proper/io/trunk/src: java/org/apache/commons/io/output/ProxyOutputStream.java test/org/apache/commons/io/output/ProxyOutputStreamTest.java
Date Fri, 01 Oct 2010 00:31:54 GMT
Author: sebb
Date: Fri Oct  1 00:31:53 2010
New Revision: 1003340

URL: http://svn.apache.org/viewvc?rev=1003340&view=rev
Log:
Fix potential NPE if proxied stream supports write((byte[]) null) without complaining
Add test for same

Added:
    commons/proper/io/trunk/src/test/org/apache/commons/io/output/ProxyOutputStreamTest.java
  (with props)
Modified:
    commons/proper/io/trunk/src/java/org/apache/commons/io/output/ProxyOutputStream.java

Modified: commons/proper/io/trunk/src/java/org/apache/commons/io/output/ProxyOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/output/ProxyOutputStream.java?rev=1003340&r1=1003339&r2=1003340&view=diff
==============================================================================
--- commons/proper/io/trunk/src/java/org/apache/commons/io/output/ProxyOutputStream.java (original)
+++ commons/proper/io/trunk/src/java/org/apache/commons/io/output/ProxyOutputStream.java Fri
Oct  1 00:31:53 2010
@@ -68,9 +68,10 @@ public class ProxyOutputStream extends F
     @Override
     public void write(byte[] bts) throws IOException {
         try {
-            beforeWrite(bts != null ? bts.length : 0);
+            int len = bts != null ? bts.length : 0;
+            beforeWrite(len);
             out.write(bts);
-            afterWrite(bts.length);
+            afterWrite(len);
         } catch (IOException e) {
             handleIOException(e);
         }

Added: commons/proper/io/trunk/src/test/org/apache/commons/io/output/ProxyOutputStreamTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/output/ProxyOutputStreamTest.java?rev=1003340&view=auto
==============================================================================
--- commons/proper/io/trunk/src/test/org/apache/commons/io/output/ProxyOutputStreamTest.java
(added)
+++ commons/proper/io/trunk/src/test/org/apache/commons/io/output/ProxyOutputStreamTest.java
Fri Oct  1 00:31:53 2010
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.io.output;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import junit.framework.TestCase;
+
+/**
+ * JUnit Test Case for {@link CloseShieldOutputStream}.
+ */
+public class ProxyOutputStreamTest extends TestCase {
+
+    private ByteArrayOutputStream original;
+
+    private OutputStream proxied;
+
+    @Override
+    protected void setUp() {
+        original = new ByteArrayOutputStream(){
+            @Override
+            public void write(byte[] ba) throws IOException {
+                if (ba != null){
+                    super.write(ba);
+                }
+            }
+        };
+        proxied = new ProxyOutputStream(original);
+    }
+
+    public void testWrite() throws Exception {
+        proxied.write('y');
+        assertEquals(1, original.size());
+        assertEquals('y', original.toByteArray()[0]);
+    }
+
+    public void testWriteNullBaSucceeds() throws Exception {
+        byte[] ba = null;
+        original.write(ba);
+        proxied.write(ba);
+    }
+}

Propchange: commons/proper/io/trunk/src/test/org/apache/commons/io/output/ProxyOutputStreamTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/io/trunk/src/test/org/apache/commons/io/output/ProxyOutputStreamTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message