Index: modules/text/src/test/java/tests/api/java/text/RuleBasedCollatorTest.java =================================================================== --- modules/text/src/test/java/tests/api/java/text/RuleBasedCollatorTest.java.orig 2006-03-23 09:39:22.000000000 +0000 +++ modules/text/src/test/java/tests/api/java/text/RuleBasedCollatorTest.java 2006-03-23 09:52:47.000000000 +0000 @@ -246,4 +246,16 @@ byte[] bytes = key.toByteArray(); } + + public void testNullPointerExpection() { + try { + RuleBasedCollator o = new RuleBasedCollator(null); + fail("Constructor RuleBasedCollator(null) "+ + "should throw NullPointerException"); + } catch (Exception e) { + assertEquals("java.lang.NullPointerException", + e.getClass().getName()); + } + } + } Index: modules/text/src/main/java/java/text/RuleBasedCollator.java =================================================================== --- modules/text/src/main/java/java/text/RuleBasedCollator.java.orig 2006-03-20 18:36:01.000000000 +0000 +++ modules/text/src/main/java/java/text/RuleBasedCollator.java 2006-03-23 09:50:06.000000000 +0000 @@ -53,6 +53,9 @@ * when the rules contains an invalid collation rule syntax. */ public RuleBasedCollator(String rules) throws ParseException { + if (rules == null) + throw new NullPointerException(); + try { this.icuColl = new com.ibm.icu.text.RuleBasedCollator(rules); } catch (Exception e) { Index: modules/text/src/main/java/java/text/Bidi.java =================================================================== --- modules/text/src/main/java/java/text/Bidi.java.orig 2006-03-20 18:36:01.000000000 +0000 +++ modules/text/src/main/java/java/text/Bidi.java 2006-03-23 10:23:46.000000000 +0000 @@ -89,6 +89,8 @@ * @see TextAttribute.RUN_DIRECTION */ public Bidi(AttributedCharacterIterator paragraph) { + if (paragraph == null) + throw new IllegalArgumentException("paragraph is null"); /* * TODO: dependency on java.awt.font.TextAttribute and * java.awt.font.NumericShaper which is not implemented yet. Index: modules/text/src/test/java/tests/api/java/text/BidiTest.java =================================================================== --- modules/text/src/test/java/tests/api/java/text/BidiTest.java.orig 2006-03-22 16:12:31.000000000 +0000 +++ modules/text/src/test/java/tests/api/java/text/BidiTest.java 2006-03-23 09:54:19.000000000 +0000 @@ -60,6 +60,13 @@ // expected } + try { + bd = new Bidi(null); + fail("should throw IAE"); + } catch (IllegalArgumentException e) { + assertEquals("paragraph is null", e.getMessage()); + } + bd = new Bidi("a".toCharArray(), 0, null, 0, 1, Bidi.DIRECTION_RIGHT_TO_LEFT); }