2002/07/01 20:59:11

darcs-hash:20040130064834-2ba56-ace67c306817cd47a070858c73f4c74126b960f2.gz

diff --git a/CHANGES b/CHANGES
index 3ef0593..479c6a7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -223,3 +223,4 @@
 24-Jun megacz MessageQueue.java: fix to MessageQueue to improve
               XML-RPC/SOAP performance
 
+01-Jul megacz DERObjectIdentifier.java: fix to work around GCC compiler bug
\ No newline at end of file

diff --git a/src/org/bouncycastle/asn1/DERObjectIdentifier.java b/src/org/bouncycastle/asn1/DERObjectIdentifier.java
index b22c7ae..8f04454 100644 (file)
--- a/src/org/bouncycastle/asn1/DERObjectIdentifier.java
+++ b/src/org/bouncycastle/asn1/DERObjectIdentifier.java
@@ -29,9 +29,10 @@ public class DERObjectIdentifier
                                     // space for 5 7 bit numbers in an int
         byte[]                  iBuf = new byte[5];    
         
-        dOut.write(
-                    Integer.parseInt(tok.nextToken()) * 40
-                    + Integer.parseInt(tok.nextToken()));
+        // FIXED by Adam Megacz -- GCJ doesn't handle evaluation order properly
+        String t1 = tok.nextToken();
+        String t2 = tok.nextToken();
+        dOut.write(Integer.parseInt(t1) * 40 + Integer.parseInt(t2));
 
         while (tok.hasMoreTokens())
         {