Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 56429 invoked from network); 23 Mar 2010 22:48:04 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Mar 2010 22:48:04 -0000 Received: (qmail 34585 invoked by uid 500); 23 Mar 2010 22:48:04 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 34565 invoked by uid 500); 23 Mar 2010 22:48:04 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 34558 invoked by uid 99); 23 Mar 2010 22:48:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Mar 2010 22:48:04 +0000 X-ASF-Spam-Status: No, hits=-1397.6 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Mar 2010 22:48:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1328623889DD; Tue, 23 Mar 2010 22:47:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r926828 - in /harmony/enhanced/trunk/classlib/modules/crypto/src/main/java: javax/crypto/CipherInputStream.java org/apache/harmony/crypto/internal/nls/messages.properties Date: Tue, 23 Mar 2010 22:47:43 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100323224743.1328623889DD@eris.apache.org> Author: hindessm Date: Tue Mar 23 22:47:42 2010 New Revision: 926828 URL: http://svn.apache.org/viewvc?rev=926828&view=rev Log: NLS fix. Modified: harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties Modified: harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java?rev=926828&r1=926827&r2=926828&view=diff ============================================================================== --- harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java (original) +++ harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/javax/crypto/CipherInputStream.java Tue Mar 23 22:47:42 2010 @@ -26,6 +26,7 @@ import java.io.IOException; import java.io.InputStream; import javax.crypto.NullCipher; import java.security.GeneralSecurityException; +import org.apache.harmony.crypto.internal.nls.Messages; /** * This class wraps an {@code InputStream} and a cipher so that {@code read()} @@ -147,7 +148,7 @@ public class CipherInputStream extends F @Override public int read(byte[] b, int off, int len) throws IOException { if (in == null) { - throw new NullPointerException("Underlying input stream is null"); + throw new NullPointerException(Messages.getString("crypto.47")); } int read_b; Modified: harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties?rev=926828&r1=926827&r2=926828&view=diff ============================================================================== --- harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties (original) +++ harmony/enhanced/trunk/classlib/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties Tue Mar 23 22:47:42 2010 @@ -85,3 +85,4 @@ crypto.43=encoding input is null\! crypto.44=Wrap crypto.45=Unwrap crypto.46=GetKeySize +crypto.47=Underlying input stream is null