Index: modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStreamTest.java =================================================================== --- modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStreamTest.java (revision 0) +++ modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStreamTest.java (revision 0) @@ -0,0 +1,36 @@ +/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable + * + * Licensed 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.harmony.crypto.tests.javax.crypto; + +import java.io.OutputStream; +import javax.crypto.Cipher; +import javax.crypto.CipherOutputStream; + +public class CipherOutputStreamTest extends junit.framework.TestCase { + + /** + * @tests javax.crypto.CipherOutputStream#close() + */ + public void test_close() throws Exception { + // regression test for HARMONY-1139 + try { + new CipherOutputStream((OutputStream)null, Cipher.getInstance("DES/CBC/PKCS5Padding")).close(); + fail("IllegalStateException expected"); + } catch (IllegalStateException e) { + //expected + } + } +} Index: modules/crypto/src/main/java/javax/crypto/CipherOutputStream.java =================================================================== --- modules/crypto/src/main/java/javax/crypto/CipherOutputStream.java (revision 441002) +++ modules/crypto/src/main/java/javax/crypto/CipherOutputStream.java (working copy) @@ -103,8 +103,10 @@ } catch (IllegalBlockSizeException e) { throw new IOException(e.getMessage()); } finally { - out.flush(); - out.close(); + if (out != null) { + out.flush(); + out.close(); + } } } }