diff options
| author | Kenny Root <kroot@google.com> | 2014-05-05 10:17:14 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2014-05-05 10:19:39 -0700 |
| commit | ebe7111e889aaa6efd076e1205f2dd669d6df690 (patch) | |
| tree | cf61449eaa5a51a9607216fe2604026b198d77b7 /bcprov/src/main/java/org/bouncycastle/asn1 | |
| parent | b0bd6578c030086b816f3ace7b37ee21ca5a25a3 (diff) | |
| download | bouncycastle-ebe7111e889aaa6efd076e1205f2dd669d6df690.tar.gz | |
Remove static initializer from StreamUtil
This causes class preinitialization to fail unnecessarily.
Change-Id: I48d55fd2ef4864fb02768ca804c1f2f3c9a84b12
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/asn1')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/StreamUtil.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/StreamUtil.java b/bcprov/src/main/java/org/bouncycastle/asn1/StreamUtil.java index b6cb0706..59e96e86 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/StreamUtil.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/StreamUtil.java @@ -8,7 +8,9 @@ import java.nio.channels.FileChannel; class StreamUtil { - private static final long MAX_MEMORY = Runtime.getRuntime().maxMemory(); + // BEGIN android-removed + // private static final long MAX_MEMORY = Runtime.getRuntime().maxMemory(); + // END android-removed /** * Find out possible longest length... @@ -48,12 +50,15 @@ class StreamUtil } } - if (MAX_MEMORY > Integer.MAX_VALUE) + // BEGIN android-changed + long maxMemory = Runtime.getRuntime().maxMemory(); + if (maxMemory > Integer.MAX_VALUE) { return Integer.MAX_VALUE; } - return (int)MAX_MEMORY; + return (int) maxMemory; + // END android-changed } static int calculateBodyLength( |