Prime.java (generateRandomPrime): Use return result from `add'.

2004-08-30  Tom Tromey  <tromey@redhat.com>

	* gnu/java/security/util/Prime.java (generateRandomPrime): Use
	return result from `add'.

From-SVN: r86787

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 44d9ce4f1f9c0a9751678b34c11e973e84dfd7a2..deaee8c674d13333289d2bd4ee64bda0f16a9b3d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-30  Tom Tromey  <tromey@redhat.com>
+
+       * gnu/java/security/util/Prime.java (generateRandomPrime): Use
+       return result from `add'.
+
 2004-08-30  Tom Tromey  <tromey@redhat.com>
 
        * java/rmi/server/UID.java (UID): Read `nextCount', not count.

diff --git a/libjava/gnu/java/security/util/Prime.java b/libjava/gnu/java/security/util/Prime.java
index 06d059e1eebc11032a79ffbba2dc3b04d470e42a..2184602f6c61674733f34cada3c2c35a1a55f9f8 100644 (file)
--- a/libjava/gnu/java/security/util/Prime.java
+++ b/libjava/gnu/java/security/util/Prime.java
@@ -1,5 +1,5 @@
 /* Prime.java --- Prime number generation utilities
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -55,12 +55,12 @@ public final class Prime
     BigInteger p = new BigInteger( (pmax + pmin)/2, new Random() );
     if( p.compareTo( BigInteger.valueOf( 1 ).shiftLeft( pmin ) ) <= 0 )
       {
-       p.add( BigInteger.valueOf( 1 ).shiftLeft( pmin ).subtract( p ) );
+       p = p.add( BigInteger.valueOf( 1 ).shiftLeft( pmin ).subtract( p ) );
       }
        
     //Step 2 - test for even
     if( p.mod( BigInteger.valueOf(2) ).compareTo( BigInteger.valueOf( 0 )) == 0)
-      p.add( BigInteger.valueOf( 1 ) );
+      p = p.add( BigInteger.valueOf( 1 ) );
 
     for(;;)
       {
@@ -76,7 +76,7 @@ public final class Prime
            // put step 2 code here so looping code is cleaner
            //Step 2 - test for even
            if( p.mod( BigInteger.valueOf(2) ).compareTo( BigInteger.valueOf( 0 )) == 0)
-             p.add( BigInteger.valueOf( 1 ) );
+             p = p.add( BigInteger.valueOf( 1 ) );
            continue;
          }
        
@@ -122,7 +122,7 @@ public final class Prime
 
       //Step 4 - test for even
       if( p.mod( BigInteger.valueOf(2) ).compareTo( BigInteger.valueOf( 0 )) == 0)
-       p.add( r );
+       p = p.add( r );
 
       for(;;)
        {