PR42134: NullPointerException in java.text.Bidi

2012-09-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR classpath/42134
	* java/text/Bidi.java:
	(Bidi(AttributedCharacterIterator)): Remove shadow
	variable text which hides the instance variable
	of the same name.  Remove unnecessary use of this.
	* NEWS: Updated.

Signed-off-by: Andrew John Hughes <gnu_andrew@member.fsf.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/java/text/Bidi.java b/java/text/Bidi.java
index 532ff4e99..236247d5e 100644
--- a/java/text/Bidi.java
+++ b/java/text/Bidi.java
@@ -161,13 +161,13 @@ public final class Bidi
     if (val instanceof NumericShaper)
       shaper = (NumericShaper) val;
 
-    char[] text = new char[iter.getEndIndex() - iter.getBeginIndex()];
-    this.embeddings = new byte[this.text.length];
-    this.embeddingOffset = 0;
-    this.length = text.length;
-    for (int i = 0; i < this.text.length; ++i)
+    text = new char[iter.getEndIndex() - iter.getBeginIndex()];
+    embeddings = new byte[text.length];
+    embeddingOffset = 0;
+    length = text.length;
+    for (int i = 0; i < text.length; ++i)
       {
-        this.text[i] = iter.current();
+        text[i] = iter.current();
 
         val = iter.getAttribute(TextAttribute.BIDI_EMBEDDING);
         if (val instanceof Integer)
@@ -178,13 +178,13 @@ public final class Bidi
               bval = 0;
             else
               bval = (byte) ival;
-            this.embeddings[i] = bval;
+            embeddings[i] = bval;
           }
       }
 
     // Invoke the numeric shaper, if specified.
     if (shaper != null)
-      shaper.shape(this.text, 0, this.length);
+      shaper.shape(text, 0, length);
 
     runBidi();
   }