KeyStore: return null when response code indicates an error.

2009-09-24 13:29:58 +08:00
parent 46a41e0e7f
commit f1ece5d0c1
1 changed files with 5 additions and 3 deletions
--- a/keystore/java/android/security/KeyStore.java
+++ b/keystore/java/android/security/KeyStore.java
@@ -172,8 +172,10 @@ public class KeyStore {
            socket.shutdownOutput();

            InputStream in = socket.getInputStream();
-            code = in.read();
-            if (code == -1) {
+            if ((code = in.read()) != NO_ERROR) {
+                if (code != -1) {
+                    mError = code;
+                }
                return null;
            }

@@ -194,7 +196,7 @@ public class KeyStore {
                }
                results.add(result);
            }
-            mError = code;
+            mError = NO_ERROR;
            return results.toArray(new byte[results.size()][]);
        } catch (IOException e) {
            // ignore