diff options
| author | Elliott Hughes <enh@google.com> | 2010-04-05 17:55:25 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2010-04-05 17:55:25 -0700 |
| commit | f307b1e2834db71e4713f6ea5d6d5bad7c4e8c03 (patch) | |
| tree | 3aca61b5cada467563f616671937296143807716 /security | |
| parent | 4033c2cf31407aabb45f469771c00534b43a20e9 (diff) | |
| parent | edd9393f000325c256ffa979c16c4b973f5e763b (diff) | |
| download | libcore-f307b1e2834db71e4713f6ea5d6d5bad7c4e8c03.zip libcore-f307b1e2834db71e4713f6ea5d6d5bad7c4e8c03.tar.gz libcore-f307b1e2834db71e4713f6ea5d6d5bad7c4e8c03.tar.bz2 | |
resolved conflicts for merge of dd53c703 to dalvik-dev
Change-Id: Ia95af76e2995ce7fb0778b020baf2882a8b0a3dd
Diffstat (limited to 'security')
| -rw-r--r-- | security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java | 43 |
1 files changed, 8 insertions, 35 deletions
diff --git a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java b/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java index f0e47d9..cc175df 100644 --- a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java +++ b/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java @@ -800,26 +800,17 @@ public class X509CertFactoryImpl extends CertificateFactorySpi { this.inStream = inStream; } - /** - * @see java.io.InputStream#available() - * method documentation for more info - */ + @Override public int available() throws IOException { return (bar - pos) + inStream.available(); } - /** - * @see java.io.InputStream#close() - * method documentation for more info - */ + @Override public void close() throws IOException { inStream.close(); } - /** - * @see java.io.InputStream#mark(int readlimit) - * method documentation for more info - */ + @Override public void mark(int readlimit) { if (pos < 0) { pos = 0; @@ -830,10 +821,7 @@ public class X509CertFactoryImpl extends CertificateFactorySpi { } } - /** - * @see java.io.InputStream#markSupported() - * method documentation for more info - */ + @Override public boolean markSupported() { return true; } @@ -881,18 +869,12 @@ public class X509CertFactoryImpl extends CertificateFactorySpi { return inStream.read(); } - /** - * @see java.io.InputStream#read(byte[] b) - * method documentation for more info - */ + @Override public int read(byte[] b) throws IOException { return read(b, 0, b.length); } - /** - * @see java.io.InputStream#read(byte[] b, int off, int len) - * method documentation for more info - */ + @Override public int read(byte[] b, int off, int len) throws IOException { int read_b; int i; @@ -905,10 +887,7 @@ public class X509CertFactoryImpl extends CertificateFactorySpi { return i; } - /** - * @see java.io.InputStream#reset() - * method documentation for more info - */ + @Override public void reset() throws IOException { if (pos >= 0) { pos = (end + 1) % BUFF_SIZE; @@ -918,10 +897,7 @@ public class X509CertFactoryImpl extends CertificateFactorySpi { } } - /** - * @see java.io.InputStream#skip(long n) - * method documentation for more info - */ + @Override public long skip(long n) throws IOException { if (pos >= 0) { long i = 0; @@ -939,6 +915,3 @@ public class X509CertFactoryImpl extends CertificateFactorySpi { } } } - - - |